diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 07d66892bc8..423b5b36b00 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -597,6 +597,9 @@ radv_handle_per_app_options(struct radv_instance *instance,
 	instance->enable_mrt_output_nan_fixup =
 		driQueryOptionb(&instance->dri_options,
 				"radv_enable_mrt_output_nan_fixup");
+
+	if (driQueryOptionb(&instance->dri_options, "radv_no_dynamic_bounds"))
+		instance->debug_flags |= RADV_DEBUG_NO_DYNAMIC_BOUNDS;
 }
 
 static const char radv_dri_options_xml[] =
@@ -607,6 +610,7 @@ DRI_CONF_BEGIN
 		DRI_CONF_VK_X11_STRICT_IMAGE_COUNT("false")
 		DRI_CONF_RADV_REPORT_LLVM9_VERSION_STRING("false")
 		DRI_CONF_RADV_ENABLE_MRT_OUTPUT_NAN_FIXUP("false")
+		DRI_CONF_RADV_NO_DYNAMIC_BOUNDS("false")
 	DRI_CONF_SECTION_END
 
 	DRI_CONF_SECTION_DEBUG
diff --git a/src/util/xmlpool/t_options.h b/src/util/xmlpool/t_options.h
index b99857c72ef..8995310865d 100644
--- a/src/util/xmlpool/t_options.h
+++ b/src/util/xmlpool/t_options.h
@@ -435,3 +435,8 @@ DRI_CONF_OPT_END
 DRI_CONF_OPT_BEGIN_B(radv_enable_mrt_output_nan_fixup, def) \
         DRI_CONF_DESC(en,gettext("Replace NaN outputs from fragment shaders with zeroes for floating point render target")) \
 DRI_CONF_OPT_END
+
+#define DRI_CONF_RADV_NO_DYNAMIC_BOUNDS(def) \
+DRI_CONF_OPT_BEGIN_B(radv_no_dynamic_bounds, def) \
+        DRI_CONF_DESC(en,gettext("Disabling bounds checking for dynamic buffer descriptors")) \
+DRI_CONF_OPT_END