From: Marek Olšák <marek.olsak@amd.com>
Date: Thu, 2 Jan 2020 20:30:36 +0000 (-0500)
Subject: radeonsi: rename SDMA debug flags
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=503bd821fa05caa86d0f007477e01433757f06d9;p=mesa.git

radeonsi: rename SDMA debug flags

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-By: Timur Kristóf <timur.kristof@gmail.com>
---

diff --git a/src/gallium/drivers/radeonsi/cik_sdma.c b/src/gallium/drivers/radeonsi/cik_sdma.c
index 52a41f7ee51..9ca9ba436cf 100644
--- a/src/gallium/drivers/radeonsi/cik_sdma.c
+++ b/src/gallium/drivers/radeonsi/cik_sdma.c
@@ -697,7 +697,7 @@ static void cik_sdma_copy(struct pipe_context *ctx,
 	 *
 	 * Keep SDMA enabled on APUs.
 	 */
-	if (sctx->screen->debug_flags & DBG(FORCE_DMA) ||
+	if (sctx->screen->debug_flags & DBG(FORCE_SDMA) ||
 	    !sctx->screen->info.has_dedicated_vram) {
 		if ((sctx->chip_class == GFX7 || sctx->chip_class == GFX8) &&
 		    cik_sdma_copy_texture(sctx, dst, dst_level, dstx, dsty, dstz,
diff --git a/src/gallium/drivers/radeonsi/si_blit.c b/src/gallium/drivers/radeonsi/si_blit.c
index 6f7cbc22dc7..9c48bf42a3a 100644
--- a/src/gallium/drivers/radeonsi/si_blit.c
+++ b/src/gallium/drivers/radeonsi/si_blit.c
@@ -1237,7 +1237,7 @@ static void si_blit(struct pipe_context *ctx,
 				  info->src.box.z,
 				  info->src.box.z + info->src.box.depth - 1);
 
-	if (sctx->screen->debug_flags & DBG(FORCE_DMA) &&
+	if (sctx->screen->debug_flags & DBG(FORCE_SDMA) &&
 	    util_try_blit_via_copy_region(ctx, info))
 		return;
 
diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
index 0ac70a5fdf5..3bea85cf8dc 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -85,8 +85,8 @@ static const struct debug_named_value debug_options[] = {
 	{ "vm", DBG(VM), "Print virtual addresses when creating resources" },
 
 	/* Driver options: */
-	{ "forcedma", DBG(FORCE_DMA), "Use asynchronous DMA for all operations when possible." },
-	{ "nodma", DBG(NO_ASYNC_DMA), "Disable asynchronous DMA" },
+	{ "forcedma", DBG(FORCE_SDMA), "Use SDMA for all operations when possible." },
+	{ "nodma", DBG(NO_SDMA), "Disable SDMA" },
 	{ "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." },
@@ -486,12 +486,12 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen,
 		goto fail;
 
 	if (sscreen->info.num_rings[RING_DMA] &&
-	    !(sscreen->debug_flags & DBG(NO_ASYNC_DMA)) &&
+	    !(sscreen->debug_flags & DBG(NO_SDMA)) &&
 	    /* SDMA timeouts sometimes on gfx10 so disable it for now. See:
 	     *    https://bugs.freedesktop.org/show_bug.cgi?id=111481
 	     *    https://gitlab.freedesktop.org/mesa/mesa/issues/1907
 	     */
-	    (sctx->chip_class != GFX10 || sscreen->debug_flags & DBG(FORCE_DMA))) {
+	    (sctx->chip_class != GFX10 || sscreen->debug_flags & DBG(FORCE_SDMA))) {
 		sctx->dma_cs = sctx->ws->cs_create(sctx->ctx, RING_DMA,
 						   (void*)si_flush_dma_cs,
 						   sctx, stop_exec_on_failure);
@@ -595,7 +595,7 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen,
 	else
 		si_init_dma_functions(sctx);
 
-	if (sscreen->debug_flags & DBG(FORCE_DMA))
+	if (sscreen->debug_flags & DBG(FORCE_SDMA))
 		sctx->b.resource_copy_region = sctx->dma_copy;
 
 	sctx->sample_mask = 0xffff;
diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h
index ee9a75c9739..1f64f77342f 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.h
+++ b/src/gallium/drivers/radeonsi/si_pipe.h
@@ -166,8 +166,8 @@ enum {
 	DBG_VM,
 
 	/* Driver options: */
-	DBG_FORCE_DMA,
-	DBG_NO_ASYNC_DMA,
+	DBG_FORCE_SDMA,
+	DBG_NO_SDMA,
 	DBG_NO_WC,
 	DBG_CHECK_VM,
 	DBG_RESERVE_VMID,