From: Marek Olšák <marek.olsak@amd.com>
Date: Tue, 1 May 2018 17:08:44 +0000 (-0400)
Subject: ac: remove 1 RB raster config for Iceland
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e7b82a9978fc226c34d46c54c4baef6182c912c8;p=mesa.git

ac: remove 1 RB raster config for Iceland

Iceland always reports 2 RBs.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
---

diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c
index 83e729b3d15..0fc71e8bf3a 100644
--- a/src/amd/common/ac_gpu_info.c
+++ b/src/amd/common/ac_gpu_info.c
@@ -565,7 +565,6 @@ ac_get_raster_config(struct radeon_info *info,
 		     uint32_t *raster_config_p,
 		     uint32_t *raster_config_1_p)
 {
-	unsigned num_rb = MIN2(info->num_render_backends, 16);
 	unsigned raster_config, raster_config_1;
 	switch (info->family) {
 	case CHIP_TAHITI:
@@ -615,10 +614,7 @@ ac_get_raster_config(struct radeon_info *info,
 		raster_config_1 = 0x0000002a;
 		break;
 	case CHIP_ICELAND:
-		if (num_rb == 1)
-			raster_config = 0x00000000;
-		else
-			raster_config = 0x00000002;
+		raster_config = 0x00000002;
 		raster_config_1 = 0x00000000;
 		break;
 	case CHIP_CARRIZO: