Mesa (master): Revert "radeonsi: enable SDMA on CIK"

[Marek Olšák]

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

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Thu Sep  8 18:21:04 2016 +0200

Revert "radeonsi: enable SDMA on CIK"

This reverts commit 0241d8300f66ee2c6c2c55fe64ac88d76440c591.

It doesn't work with mobile Bonaire. It looks like the programming of
tiling parameters is wrong on some chips.

---

 src/gallium/drivers/radeonsi/cik_sdma.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/gallium/drivers/radeonsi/cik_sdma.c b/src/gallium/drivers/radeonsi/cik_sdma.c
index e1fd050..d15d8dc 100644
--- a/src/gallium/drivers/radeonsi/cik_sdma.c
+++ b/src/gallium/drivers/radeonsi/cik_sdma.c
@@ -165,6 +165,10 @@ static bool cik_sdma_copy_texture(struct si_context *sctx,
 	       src_slice_pitch * bpp * (srcz + src_box->depth) <=
 	       rsrc->resource.buf->size);
 
+	/* Test CIK with radeon and amdgpu before enabling this. */
+	if (sctx->b.chip_class == CIK)
+		return false;
+
 	if (!r600_prepare_for_dma_blit(&sctx->b, rdst, dst_level, dstx, dsty,
 					dstz, rsrc, src_level, src_box))
 		return false;