From 6e7e208867ecb425a8d18496fbfadc64cf6edee8 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Thu, 12 Nov 2020 10:51:42 +0100 Subject: [PATCH] radeonsi: remove AMD_DEBUG=zerovram flag MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The same feature is available by using: radeonsi_zerovram=true Reviewed-by: Marek Olšák Part-of: --- docs/envvars.rst | 2 -- src/gallium/drivers/radeonsi/si_pipe.c | 1 - src/gallium/drivers/radeonsi/si_pipe.h | 1 - src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c | 1 - 4 files changed, 5 deletions(-) diff --git a/docs/envvars.rst b/docs/envvars.rst index 867214c2764..052b3b02599 100644 --- a/docs/envvars.rst +++ b/docs/envvars.rst @@ -659,8 +659,6 @@ radeonsi driver environment variables Disable SDMA clears ``nodmacopyimage`` Disable SDMA image copies -``zerovram`` - Clear VRAM allocations. ``nodcc`` Disable DCC. ``nodccclear`` diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index d849841c000..8ffe3f96ede 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -89,7 +89,6 @@ static const struct debug_named_value debug_options[] = { {"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."}, - {"zerovram", DBG(ZERO_VRAM), "Clear VRAM allocations."}, {"shadowregs", DBG(SHADOW_REGS), "Enable CP register shadowing."}, /* 3D engine options: */ diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h index c9dec48b414..c72708d9e21 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.h +++ b/src/gallium/drivers/radeonsi/si_pipe.h @@ -183,7 +183,6 @@ enum DBG_NO_WC, DBG_CHECK_VM, DBG_RESERVE_VMID, - DBG_ZERO_VRAM, DBG_SHADOW_REGS, /* 3D engine options: */ diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c index 8a0aedfed64..35d7cb816e6 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c @@ -112,7 +112,6 @@ static bool do_winsys_init(struct amdgpu_winsys *ws, ws->reserve_vmid = strstr(debug_get_option("R600_DEBUG", ""), "reserve_vmid") != NULL || strstr(debug_get_option("AMD_DEBUG", ""), "reserve_vmid") != NULL; ws->zero_all_vram_allocs = strstr(debug_get_option("R600_DEBUG", ""), "zerovram") != NULL || - strstr(debug_get_option("AMD_DEBUG", ""), "zerovram") != NULL || driQueryOptionb(config->options, "radeonsi_zerovram"); return true;