Mesa (master): radeonsi: disable 2D tiling on CIK for now

[Alex Deucher]

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

Author: Alex Deucher <alexander.deucher at amd.com>
Date:   Fri May  3 17:12:04 2013 -0400

radeonsi: disable 2D tiling on CIK for now

Causes GPU hangs.

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

---

 src/gallium/drivers/radeonsi/r600_texture.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/r600_texture.c b/src/gallium/drivers/radeonsi/r600_texture.c
index 8992f9a..282d4f2 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;
 		}
 	}