KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Marek Olšák 2020-01-02 15:30:36 -05:00
parent d62dd8b0cb
commit 503bd821fa
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/drivers/radeonsi/cik_sdma.c
View File

@ -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,

2
src/gallium/drivers/radeonsi/si_blit.c
View File

@ -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;

10
src/gallium/drivers/radeonsi/si_pipe.c
View File

@ -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;

4
src/gallium/drivers/radeonsi/si_pipe.h
View File

@ -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,