From: Alex Deucher <alexander.deucher@amd.com>
Date: Wed, 10 Jun 2015 15:43:24 +0000 (-0400)
Subject: radeonsi: properly handler raster_config setup on CZ
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f0e24a7beae57f24501fa9d3b6b947fc20ca23bb;p=mesa.git

radeonsi: properly handler raster_config setup on CZ

Need to take into account the number of RBs.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index c95fbf84047..83b7db2b1dd 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -3190,10 +3190,10 @@ static void si_init_config(struct si_context *sctx)
 			si_pm4_set_reg(pm4, R_028354_PA_SC_RASTER_CONFIG_1, 0x0000002a);
 			break;
 		case CHIP_ICELAND:
-		case CHIP_CARRIZO:
 			si_pm4_set_reg(pm4, R_028350_PA_SC_RASTER_CONFIG, 0x00000002);
 			si_pm4_set_reg(pm4, R_028354_PA_SC_RASTER_CONFIG_1, 0x00000000);
 			break;
+		case CHIP_CARRIZO:
 		case CHIP_KAVERI:
 			if (num_rb > 1)
 				si_pm4_set_reg(pm4, R_028350_PA_SC_RASTER_CONFIG, 0x00000002);