Mesa (master): radv: don't setup raster_config on gfx9.

[Dave Airlie]

Module: Mesa
Branch: master
Commit: 98f27b9ccec3424ce5bd0ed3908c832e10605672
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=98f27b9ccec3424ce5bd0ed3908c832e10605672

Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Jun  6 08:48:25 2017 +1000

radv: don't setup raster_config on gfx9.

Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Signed-off-by: Dave Airlie <airlied at redhat.com>

---

 src/amd/vulkan/si_cmd_buffer.c | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/amd/vulkan/si_cmd_buffer.c b/src/amd/vulkan/si_cmd_buffer.c
index 604a5e218a..b848325c9b 100644
--- a/src/amd/vulkan/si_cmd_buffer.c
+++ b/src/amd/vulkan/si_cmd_buffer.c
@@ -329,24 +329,28 @@ si_emit_config(struct radv_physical_device *physical_device,
 		raster_config_1 = 0x00000000;
 		break;
 	default:
-		fprintf(stderr,
-			"radeonsi: Unknown GPU, using 0 for raster_config\n");
-		raster_config = 0x00000000;
-		raster_config_1 = 0x00000000;
+		if (physical_device->rad_info.chip_class <= VI) {
+			fprintf(stderr,
+				"radeonsi: Unknown GPU, using 0 for raster_config\n");
+			raster_config = 0x00000000;
+			raster_config_1 = 0x00000000;
+		}
 		break;
 	}
 
 	/* Always use the default config when all backends are enabled
 	 * (or when we failed to determine the enabled backends).
 	 */
-	if (!rb_mask || util_bitcount(rb_mask) >= num_rb) {
-		radeon_set_context_reg(cs, R_028350_PA_SC_RASTER_CONFIG,
-				       raster_config);
-		if (physical_device->rad_info.chip_class >= CIK)
-			radeon_set_context_reg(cs, R_028354_PA_SC_RASTER_CONFIG_1,
-					       raster_config_1);
-	} else {
-		si_write_harvested_raster_configs(physical_device, cs, raster_config, raster_config_1);
+	if (physical_device->rad_info.chip_class <= VI) {
+		if (!rb_mask || util_bitcount(rb_mask) >= num_rb) {
+			radeon_set_context_reg(cs, R_028350_PA_SC_RASTER_CONFIG,
+					       raster_config);
+			if (physical_device->rad_info.chip_class >= CIK)
+				radeon_set_context_reg(cs, R_028354_PA_SC_RASTER_CONFIG_1,
+						       raster_config_1);
+		} else {
+			si_write_harvested_raster_configs(physical_device, cs, raster_config, raster_config_1);
+		}
 	}
 
 	radeon_set_context_reg(cs, R_028204_PA_SC_WINDOW_SCISSOR_TL, S_028204_WINDOW_OFFSET_DISABLE(1));