Mesa (master): radeonsi: disable fast color clear for 1D-tiled surfaces on CIK

[Marek Olšák]

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

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Sat Mar 22 17:25:26 2014 +0100

radeonsi: disable fast color clear for 1D-tiled surfaces on CIK

This will be re-enabled once my kernel fix lands.

---

 src/gallium/drivers/radeon/r600_texture.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/gallium/drivers/radeon/r600_texture.c b/src/gallium/drivers/radeon/r600_texture.c
index be10b46..45a9508 100644
--- a/src/gallium/drivers/radeon/r600_texture.c
+++ b/src/gallium/drivers/radeon/r600_texture.c
@@ -1255,6 +1255,12 @@ void evergreen_do_fast_color_clear(struct r600_common_context *rctx,
 			continue;
 		}
 
+		/* fast color clear with 1D tiling doesn't work on CIK */
+		if (tex->surface.level[0].mode == RADEON_SURF_MODE_1D &&
+		    rctx->chip_class >= CIK) {
+			continue;
+		}
+
 		/* ensure CMASK is enabled */
 		r600_texture_alloc_cmask_separate(rctx->screen, tex);
 		if (tex->cmask.size == 0) {