From fa059811c523fa341de9d5b5fd95cfaccf40327f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Tue, 9 Aug 2022 20:10:09 -0400 Subject: [PATCH] radeonsi: simplify radeonsi_zerovram implementation Reviewed-by: Mihai Preda Reviewed-by: Pierre-Eric Pelloux-Prayer Acked-by: Adam Jackson Part-of: --- src/gallium/drivers/radeonsi/driinfo_radeonsi.h | 1 - src/gallium/drivers/radeonsi/si_debug_options.h | 1 + src/util/driconf.h | 8 -------- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/gallium/drivers/radeonsi/driinfo_radeonsi.h b/src/gallium/drivers/radeonsi/driinfo_radeonsi.h index c58aff9f7fe..7cfe86175a0 100644 --- a/src/gallium/drivers/radeonsi/driinfo_radeonsi.h +++ b/src/gallium/drivers/radeonsi/driinfo_radeonsi.h @@ -1,7 +1,6 @@ // DriConf options specific to radeonsi DRI_CONF_SECTION_PERFORMANCE DRI_CONF_ADAPTIVE_SYNC(true) -DRI_CONF_RADEONSI_ZERO_ALL_VRAM_ALLOCS(false) DRI_CONF_SECTION_END DRI_CONF_SECTION_DEBUG diff --git a/src/gallium/drivers/radeonsi/si_debug_options.h b/src/gallium/drivers/radeonsi/si_debug_options.h index a01da8c6378..c90ef1d39aa 100644 --- a/src/gallium/drivers/radeonsi/si_debug_options.h +++ b/src/gallium/drivers/radeonsi/si_debug_options.h @@ -20,6 +20,7 @@ OPT_INT(max_vram_map_size, 8196, "Maximum size of a buffer in VRAM to map direct OPT_BOOL(force_use_fma32, false, "Force use fma32 instruction for GPU family newer than gfx9") OPT_BOOL(dcc_msaa, false, "Enable DCC for MSAA") OPT_BOOL(mall_noalloc, false, "Don't use MALL (infinity cache)") +OPT_BOOL(zerovram, false, "Zero all VRAM allocations") #undef OPT_BOOL #undef OPT_INT diff --git a/src/util/driconf.h b/src/util/driconf.h index d43af09ff12..894cb43eca0 100644 --- a/src/util/driconf.h +++ b/src/util/driconf.h @@ -479,14 +479,6 @@ DRI_CONF_OPT_B(force_sw_rendering_on_cpu, def, \ "If set to false, emulates software rendering on the requested device, else uses a software renderer.") -/** - * \brief radeonsi specific configuration options - */ - -#define DRI_CONF_RADEONSI_ZERO_ALL_VRAM_ALLOCS(def) \ - DRI_CONF_OPT_B(radeonsi_zerovram, def, \ - "Zero all vram allocations") - #define DRI_CONF_V3D_NONMSAA_TEXTURE_SIZE_LIMIT(def) \ DRI_CONF_OPT_B(v3d_nonmsaa_texture_size_limit, def, \ "Report the non-MSAA-only texture size limit")