summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2016-09-08 18:21:04 +0200
committerMarek Olšák <[email protected]>2016-09-08 22:51:33 +0200
commit93f3d8e10d712336b86ebe17dafaee0aac7ec429 (patch)
treeef001258f0688e5c5f9b0200d4528710f9e5be71 /src
parent7b414bc51216ccddaaafa939d22eac281e291d0a (diff)
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.
Diffstat (limited to 'src')
-rw-r--r--src/gallium/drivers/radeonsi/cik_sdma.c4
1 files changed, 4 insertions, 0 deletions
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;