Mesa (10.6): Revert "radeonsi: properly set the raster_config for KV"
Emil Velikov
evelikov at kemper.freedesktop.org
Sat Aug 22 10:00:33 UTC 2015
Module: Mesa
Branch: 10.6
Commit: 76cc235e2b5605b9a9e93855c38e12cd19929acd
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=76cc235e2b5605b9a9e93855c38e12cd19929acd
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Sat Aug 22 10:12:52 2015 +0100
Revert "radeonsi: properly set the raster_config for KV"
This reverts commit 20bb0a771dded700ba1b213256bf47dfedbdfd77.
Requested-by: Alex Deucher <alexdeucher at gmail.com>
---
src/gallium/drivers/radeonsi/si_state.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index fb6dba2..4d38a32 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -3023,7 +3023,6 @@ si_write_harvested_raster_configs(struct si_context *sctx,
void si_init_config(struct si_context *sctx)
{
- unsigned num_rb = sctx->screen->b.info.r600_num_backends;
struct si_pm4_state *pm4 = CALLOC_STRUCT(si_pm4_state);
if (pm4 == NULL)
@@ -3072,17 +3071,14 @@ void si_init_config(struct si_context *sctx)
si_pm4_set_reg(pm4, R_028354_PA_SC_RASTER_CONFIG_1, 0x0000002e);
break;
case CHIP_KAVERI:
- if (num_rb > 1)
- si_pm4_set_reg(pm4, R_028350_PA_SC_RASTER_CONFIG, 0x00000002);
- else
- si_pm4_set_reg(pm4, R_028350_PA_SC_RASTER_CONFIG, 0x00000000);
- si_pm4_set_reg(pm4, R_028354_PA_SC_RASTER_CONFIG_1, 0x00000000);
- break;
+ /* XXX todo */
case CHIP_KABINI:
+ /* XXX todo */
case CHIP_MULLINS:
+ /* XXX todo */
default:
- si_pm4_set_reg(pm4, R_028350_PA_SC_RASTER_CONFIG, 0x00000000);
- si_pm4_set_reg(pm4, R_028354_PA_SC_RASTER_CONFIG_1, 0x00000000);
+ si_pm4_set_reg(pm4, R_028350_PA_SC_RASTER_CONFIG, 0);
+ si_pm4_set_reg(pm4, R_028354_PA_SC_RASTER_CONFIG_1, 0);
break;
}
} else {
More information about the mesa-commit
mailing list