From: Marek Olšák Date: Mon, 24 Oct 2016 17:32:31 +0000 (+0200) Subject: radeonsi: enable SDMA on Carrizo and all CIK chips again X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d883c83ba99c5459a8bb9183420124518b489ff8;p=mesa.git 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 Reviewed-by: Nicolai Hähnle --- 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;