From cd6a4f7631bc8767eff26251011c8088d480f177 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Thu, 2 Jan 2020 15:43:53 -0500 Subject: [PATCH] radeonsi: add AMD_DEBUG=nodmacopyimage for debugging MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Pierre-Eric Pelloux-Prayer Reviewed-By: Timur Kristóf --- src/gallium/drivers/radeonsi/cik_sdma.c | 3 ++- src/gallium/drivers/radeonsi/si_pipe.c | 1 + src/gallium/drivers/radeonsi/si_pipe.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/radeonsi/cik_sdma.c b/src/gallium/drivers/radeonsi/cik_sdma.c index 9ca9ba436cf..c2406604d9e 100644 --- a/src/gallium/drivers/radeonsi/cik_sdma.c +++ b/src/gallium/drivers/radeonsi/cik_sdma.c @@ -698,7 +698,8 @@ static void cik_sdma_copy(struct pipe_context *ctx, * Keep SDMA enabled on APUs. */ if (sctx->screen->debug_flags & DBG(FORCE_SDMA) || - !sctx->screen->info.has_dedicated_vram) { + (!sctx->screen->info.has_dedicated_vram && + !(sctx->screen->debug_flags & DBG(NO_SDMA_COPY_IMAGE)))) { if ((sctx->chip_class == GFX7 || sctx->chip_class == GFX8) && cik_sdma_copy_texture(sctx, dst, dst_level, dstx, dsty, dstz, src, src_level, src_box)) diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index 9c26da9d49c..52048ad7a54 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -88,6 +88,7 @@ static const struct debug_named_value debug_options[] = { { "forcedma", DBG(FORCE_SDMA), "Use SDMA for all operations when possible." }, { "nodma", DBG(NO_SDMA), "Disable SDMA" }, { "nodmaclear", DBG(NO_SDMA_CLEARS), "Disable SDMA clears" }, + { "nodmacopyimage", DBG(NO_SDMA_COPY_IMAGE), "Disable SDMA image copies" }, { "nowc", DBG(NO_WC), "Disable GTT write combining" }, { "check_vm", DBG(CHECK_VM), "Check VM faults and dump debug info." }, { "reserve_vmid", DBG(RESERVE_VMID), "Force VMID reservation per context." }, diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h index 0aef94b0a2b..8e960341ae7 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.h +++ b/src/gallium/drivers/radeonsi/si_pipe.h @@ -169,6 +169,7 @@ enum { DBG_FORCE_SDMA, DBG_NO_SDMA, DBG_NO_SDMA_CLEARS, + DBG_NO_SDMA_COPY_IMAGE, DBG_NO_WC, DBG_CHECK_VM, DBG_RESERVE_VMID, -- 2.30.2