From: Alex Deucher <alexander.deucher@amd.com>
Date: Fri, 3 May 2013 21:12:04 +0000 (-0400)
Subject: radeonsi: disable 2D tiling on CIK for now
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d669992e3543ccdc9a9f8c9d8b375f292b4a9315;p=mesa.git

radeonsi: disable 2D tiling on CIK for now

Causes GPU hangs.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/src/gallium/drivers/radeonsi/r600_texture.c b/src/gallium/drivers/radeonsi/r600_texture.c
index 8992f9a1fa2..282d4f24253 100644
--- a/src/gallium/drivers/radeonsi/r600_texture.c
+++ b/src/gallium/drivers/radeonsi/r600_texture.c
@@ -532,7 +532,10 @@ struct pipe_resource *si_texture_create(struct pipe_screen *screen,
 		if (util_format_is_compressed(templ->format)) {
 			array_mode = V_009910_ARRAY_1D_TILED_THIN1;
 		} else {
-			array_mode = V_009910_ARRAY_2D_TILED_THIN1;
+			if (rscreen->chip_class >= CIK)
+				array_mode = V_009910_ARRAY_1D_TILED_THIN1; /* XXX fix me */
+			else
+				array_mode = V_009910_ARRAY_2D_TILED_THIN1;
 		}
 	}