diff options
| author | Alex Deucher <[email protected]> | 2013-01-24 19:08:07 -0500 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2013-02-04 15:43:21 -0500 |
| commit | 83e4407f443fb6baeccf9aefee291c82adcaa58b (patch) | |
| tree | 304e4720139b59b127e8813c116fbabe11f2fe93 /src | |
| parent | 99b78337e38308480ee491493b045179f10ed579 (diff) | |
radeonsi: add support for Oland chips
Signed-off-by: Alex Deucher <[email protected]>
Note: this is a candidate for the 9.1 branch
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/radeonsi/radeonsi_pipe.c | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state.c | 3 | ||||
| -rw-r--r-- | src/gallium/winsys/radeon/drm/radeon_drm_winsys.c | 1 | ||||
| -rw-r--r-- | src/gallium/winsys/radeon/drm/radeon_winsys.h | 1 |
4 files changed, 6 insertions, 0 deletions
diff --git a/src/gallium/drivers/radeonsi/radeonsi_pipe.c b/src/gallium/drivers/radeonsi/radeonsi_pipe.c index c88a613b8b2..744dac4be0c 100644 --- a/src/gallium/drivers/radeonsi/radeonsi_pipe.c +++ b/src/gallium/drivers/radeonsi/radeonsi_pipe.c @@ -280,6 +280,7 @@ static const char *r600_get_family_name(enum radeon_family family) case CHIP_TAHITI: return "AMD TAHITI"; case CHIP_PITCAIRN: return "AMD PITCAIRN"; case CHIP_VERDE: return "AMD CAPE VERDE"; + case CHIP_OLAND: return "AMD OLAND"; default: return "AMD unknown"; } } diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index e81079edb56..6478e9a42dd 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -2665,6 +2665,9 @@ void si_init_config(struct r600_context *rctx) default: si_pm4_set_reg(pm4, R_028350_PA_SC_RASTER_CONFIG, 0x0000124a); break; + case CHIP_OLAND: + si_pm4_set_reg(pm4, R_028350_PA_SC_RASTER_CONFIG, 0x00000082); + break; } si_pm4_set_state(rctx, init, pm4); diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c index d23220df8a8..62ba4b1f713 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c +++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c @@ -312,6 +312,7 @@ static boolean do_winsys_init(struct radeon_drm_winsys *ws) case CHIP_TAHITI: case CHIP_PITCAIRN: case CHIP_VERDE: + case CHIP_OLAND: 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 8b64ef2e1a1..c57a87d7a9b 100644 --- a/src/gallium/winsys/radeon/drm/radeon_winsys.h +++ b/src/gallium/winsys/radeon/drm/radeon_winsys.h @@ -123,6 +123,7 @@ enum radeon_family { CHIP_TAHITI, CHIP_PITCAIRN, CHIP_VERDE, + CHIP_OLAND, CHIP_LAST, }; |