diff --git a/src/amd/vulkan/radv_instance.c b/src/amd/vulkan/radv_instance.c
index 6683057bf34..0cc6852f697 100644
--- a/src/amd/vulkan/radv_instance.c
+++ b/src/amd/vulkan/radv_instance.c
@@ -199,7 +199,6 @@ static const driOptionDescription radv_dri_options[] = {
DRI_CONF_RADV_APP_LAYER()
DRI_CONF_RADV_EMULATE_RT(false)
DRI_CONF_RADV_ENABLE_FLOAT16_GFX8(false)
- DRI_CONF_RADV_DISABLE_HIZ_HIS_GFX12(false)
DRI_CONF_RADV_COOPERATIVE_MATRIX2_NV(false)
DRI_CONF_SECTION_END
};
@@ -214,7 +213,6 @@ radv_init_dri_debug_options(struct radv_instance *instance)
drirc->debug.disable_dcc_mips = driQueryOptionb(&drirc->options, "radv_disable_dcc_mips");
drirc->debug.disable_dcc_stores = driQueryOptionb(&drirc->options, "radv_disable_dcc_stores");
drirc->debug.disable_depth_storage = driQueryOptionb(&drirc->options, "radv_disable_depth_storage");
- drirc->debug.disable_hiz_his_gfx12 = driQueryOptionb(&drirc->options, "radv_disable_hiz_his_gfx12");
drirc->debug.disable_shrink_image_store = driQueryOptionb(&drirc->options, "radv_disable_shrink_image_store");
drirc->debug.disable_sinking_load_input_fs = driQueryOptionb(&drirc->options, "radv_disable_sinking_load_input_fs");
drirc->debug.disable_tc_compat_htile_in_general =
diff --git a/src/amd/vulkan/radv_instance.h b/src/amd/vulkan/radv_instance.h
index e43b61276ea..9d63eff61b0 100644
--- a/src/amd/vulkan/radv_instance.h
+++ b/src/amd/vulkan/radv_instance.h
@@ -43,7 +43,6 @@ struct radv_drirc {
bool disable_dcc_mips;
bool disable_dcc_stores;
bool disable_depth_storage;
- bool disable_hiz_his_gfx12;
bool disable_shrink_image_store;
bool disable_sinking_load_input_fs;
bool disable_tc_compat_htile_in_general;
diff --git a/src/amd/vulkan/radv_physical_device.c b/src/amd/vulkan/radv_physical_device.c
index b6095498a19..2c27a344790 100644
--- a/src/amd/vulkan/radv_physical_device.c
+++ b/src/amd/vulkan/radv_physical_device.c
@@ -2309,8 +2309,6 @@ radv_physical_device_try_create(struct radv_instance *instance, drmDevicePtr drm
pdev->use_fmask = pdev->info.gfx_level < GFX11 && !(instance->debug_flags & RADV_DEBUG_NO_FMASK);
pdev->use_hiz = !(instance->debug_flags & RADV_DEBUG_NO_HIZ);
- if (pdev->info.gfx_level == GFX12 && instance->drirc.debug.disable_hiz_his_gfx12)
- pdev->use_hiz = false;
if (pdev->info.gfx_level == GFX12) {
const char *gfx12_hiz_wa_str = instance->drirc.performance.gfx12_hiz_wa;
diff --git a/src/util/00-radv-defaults.conf b/src/util/00-radv-defaults.conf
index b82e8d4da4d..8342c475d55 100644
--- a/src/util/00-radv-defaults.conf
+++ b/src/util/00-radv-defaults.conf
@@ -180,10 +180,6 @@ Application bugs worked around in this file:
-
-
-
-
diff --git a/src/util/driconf.h b/src/util/driconf.h
index 2d7d1698ce0..7237aabc693 100644
--- a/src/util/driconf.h
+++ b/src/util/driconf.h
@@ -788,10 +788,6 @@
DRI_CONF_OPT_B(radv_enable_float16_gfx8, def, \
"Expose float16 on GFX8, where it's supported but usually not beneficial.")
-#define DRI_CONF_RADV_DISABLE_HIZ_HIS_GFX12(def) \
- DRI_CONF_OPT_B(radv_disable_hiz_his_gfx12, def, \
- "Disable HiZ/HiS on GFX12 (RDNA4) to workaround a hw bug that causes random GPU hangs")
-
#define DRI_CONF_RADV_COOPERATIVE_MATRIX2_NV(def) \
DRI_CONF_OPT_B(radv_cooperative_matrix2_nv, def, \
"Expose VK_NV_cooperative_matrix2 on supported hardware.")