From 4045c3d0601f1e3280625ed837846ecad5d051f7 Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Mon, 13 May 2013 16:24:02 -0400 Subject: [PATCH] radeonsi: add support for hainan chips MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Note: this is a candidate for the 9.1 branch Signed-off-by: Alex Deucher Reviewed-by: Michel Dänzer --- src/gallium/drivers/radeonsi/radeonsi_pipe.c | 1 + src/gallium/drivers/radeonsi/si_state.c | 3 +++ src/gallium/winsys/radeon/drm/radeon_drm_winsys.c | 1 + src/gallium/winsys/radeon/drm/radeon_winsys.h | 1 + 4 files changed, 6 insertions(+) diff --git a/src/gallium/drivers/radeonsi/radeonsi_pipe.c b/src/gallium/drivers/radeonsi/radeonsi_pipe.c index 0e6b9417652..fa400970e6f 100644 --- a/src/gallium/drivers/radeonsi/radeonsi_pipe.c +++ b/src/gallium/drivers/radeonsi/radeonsi_pipe.c @@ -300,6 +300,7 @@ static const char *r600_get_family_name(enum radeon_family family) case CHIP_PITCAIRN: return "AMD PITCAIRN"; case CHIP_VERDE: return "AMD CAPE VERDE"; case CHIP_OLAND: return "AMD OLAND"; + case CHIP_HAINAN: return "AMD HAINAN"; default: return "AMD unknown"; } } diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index be40fdfbc5b..ed95b1d8d89 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -2791,6 +2791,9 @@ void si_init_config(struct r600_context *rctx) case CHIP_OLAND: si_pm4_set_reg(pm4, R_028350_PA_SC_RASTER_CONFIG, 0x00000082); break; + case CHIP_HAINAN: + si_pm4_set_reg(pm4, R_028350_PA_SC_RASTER_CONFIG, 0x00000000); + break; default: si_pm4_set_reg(pm4, R_028350_PA_SC_RASTER_CONFIG, 0x00000000); break; diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c index 368902039c4..15d5d3157eb 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c +++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c @@ -321,6 +321,7 @@ static boolean do_winsys_init(struct radeon_drm_winsys *ws) case CHIP_PITCAIRN: case CHIP_VERDE: case CHIP_OLAND: + case CHIP_HAINAN: ws->info.chip_class = TAHITI; break; } diff --git a/src/gallium/winsys/radeon/drm/radeon_winsys.h b/src/gallium/winsys/radeon/drm/radeon_winsys.h index 1c2fb698981..d0f16e1800f 100644 --- a/src/gallium/winsys/radeon/drm/radeon_winsys.h +++ b/src/gallium/winsys/radeon/drm/radeon_winsys.h @@ -124,6 +124,7 @@ enum radeon_family { CHIP_PITCAIRN, CHIP_VERDE, CHIP_OLAND, + CHIP_HAINAN, CHIP_LAST, };