diff --git a/src/amd/vulkan/radv_instance.c b/src/amd/vulkan/radv_instance.c
index db9770fd0a1..8c656491672 100644
--- a/src/amd/vulkan/radv_instance.c
+++ b/src/amd/vulkan/radv_instance.c
@@ -134,6 +134,7 @@ static const driOptionDescription radv_dri_options[] = {
DRI_CONF_RADV_NO_DYNAMIC_BOUNDS(false)
DRI_CONF_RADV_OVERRIDE_UNIFORM_OFFSET_ALIGNMENT(0)
DRI_CONF_RADV_CLEAR_LDS(false)
+ DRI_CONF_RADV_DISABLE_NGG_GS(false)
DRI_CONF_SECTION_END
DRI_CONF_SECTION_DEBUG
@@ -202,6 +203,9 @@ radv_init_dri_options(struct radv_instance *instance)
if (driQueryOptionb(&instance->drirc.options, "radv_disable_dcc"))
instance->debug_flags |= RADV_DEBUG_NO_DCC;
+ if (driQueryOptionb(&instance->drirc.options, "radv_disable_ngg_gs"))
+ instance->debug_flags |= RADV_DEBUG_NO_NGG_GS;
+
instance->drirc.clear_lds = driQueryOptionb(&instance->drirc.options, "radv_clear_lds");
instance->drirc.zero_vram = driQueryOptionb(&instance->drirc.options, "radv_zero_vram");
diff --git a/src/util/00-radv-defaults.conf b/src/util/00-radv-defaults.conf
index d7e6115c866..525fb5c02a7 100644
--- a/src/util/00-radv-defaults.conf
+++ b/src/util/00-radv-defaults.conf
@@ -159,6 +159,10 @@ Application bugs worked around in this file:
+
+
+
+
diff --git a/src/util/driconf.h b/src/util/driconf.h
index 837e3541075..6a7331f3f9e 100644
--- a/src/util/driconf.h
+++ b/src/util/driconf.h
@@ -724,6 +724,9 @@
DRI_CONF_OPT_B(radv_force_active_accel_struct_leaves, def, \
"Force leaf nodes of acceleration structures to be marked active.")
+#define DRI_CONF_RADV_DISABLE_NGG_GS(def) \
+ DRI_CONF_OPT_B(radv_disable_ngg_gs, def, "Disable NGG GS on GFX10/GFX10.3.")
+
/**
* \brief ANV specific configuration options
*/