From: Marek Olšák <marek.olsak@amd.com>
Date: Thu, 8 Sep 2016 16:21:04 +0000 (+0200)
Subject: Revert "radeonsi: enable SDMA on CIK"
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=93f3d8e10d712336b86ebe17dafaee0aac7ec429;p=mesa.git

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.
---

diff --git a/src/gallium/drivers/radeonsi/cik_sdma.c b/src/gallium/drivers/radeonsi/cik_sdma.c
index e1fd0503390..d15d8dc8bb3 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;