summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Olšák <marek.olsak@amd.com>2016-10-24 19:32:31 +0200
committerMarek Olšák <marek.olsak@amd.com>2016-10-26 13:02:58 +0200
commitd883c83ba99c5459a8bb9183420124518b489ff8 (patch)
tree0ddee5f09a805555ae03f289dbe1c97c0038cf7d
parent6ec3b2a4b1d41b83a4721d06b42c49f55e695cbf (diff)
radeonsi: enable SDMA on Carrizo and all CIK chips again
SDMA might be fixed by: "winsys/amdgpu: fix radeon_surf::macro_tile_index for imported textures" Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
-rw-r--r--src/gallium/drivers/radeonsi/cik_sdma.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/gallium/drivers/radeonsi/cik_sdma.c b/src/gallium/drivers/radeonsi/cik_sdma.c
index 141fb01ab16..3a181187f34 100644
--- a/src/gallium/drivers/radeonsi/cik_sdma.c
+++ b/src/gallium/drivers/radeonsi/cik_sdma.c
@@ -162,10 +162,6 @@ 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;
@@ -517,12 +513,6 @@ static void cik_sdma_copy(struct pipe_context *ctx,
return;
}
- /* Carrizo SDMA texture copying is very broken for some users.
- * https://bugs.freedesktop.org/show_bug.cgi?id=97029
- */
- if (sctx->b.family == CHIP_CARRIZO)
- goto fallback;
-
if (cik_sdma_copy_texture(sctx, dst, dst_level, dstx, dsty, dstz,
src, src_level, src_box))
return;