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>

diff --git a/src/gallium/drivers/radeonsi/cik_sdma.c b/src/gallium/drivers/radeonsi/cik_sdma.c
index 141fb01ab1639c0da06f02f8e057a1f766cd5a8e..3a181187f3475aba3347fc923774dd9ea03558a2 100644 (file)
--- 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;