From 34bd8427f882ad69c56202f134c2ee23edc9a9ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Tue, 17 Sep 2024 14:40:08 -0400 Subject: [PATCH] radeonsi/gfx12: fix shader uploads via CP DMA It was incorrectly assumed that CP DMA is never used. Fixes: c90d4e0d570 - radeonsi/gfx12: remove CP DMA workarounds because CP DMA is never used on gfx12 Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/gallium/drivers/radeonsi/si_cp_dma.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_cp_dma.c b/src/gallium/drivers/radeonsi/si_cp_dma.c index b032f144cd8..8103d3058c3 100644 --- a/src/gallium/drivers/radeonsi/si_cp_dma.c +++ b/src/gallium/drivers/radeonsi/si_cp_dma.c @@ -20,7 +20,7 @@ static bool cp_dma_use_L2(struct si_context *sctx) { - return sctx->gfx_level >= GFX7; + return sctx->gfx_level >= GFX7 && !sctx->screen->info.cp_sdma_ge_use_system_memory_scope; } /* The max number of bytes that can be copied per packet. */ @@ -242,7 +242,6 @@ void si_cp_dma_copy_buffer(struct si_context *sctx, struct pipe_resource *dst, struct pipe_resource *src, uint64_t dst_offset, uint64_t src_offset, unsigned size, unsigned user_flags) { - assert(!sctx->screen->info.cp_sdma_ge_use_system_memory_scope); assert(size); assert(dst && src);