diff --git a/src/amd/vulkan/radv_instance.c b/src/amd/vulkan/radv_instance.c index d9240de2b7e..3caa7aa86f5 100644 --- a/src/amd/vulkan/radv_instance.c +++ b/src/amd/vulkan/radv_instance.c @@ -187,7 +187,6 @@ static const driOptionDescription radv_dri_options[] = { DRI_CONF_RADV_TEX_NON_UNIFORM(false) DRI_CONF_RADV_FLUSH_BEFORE_TIMESTAMP_WRITE(false) DRI_CONF_RADV_RT_WAVE64(false) - DRI_CONF_RADV_DISABLE_DEDICATED_SPARSE_QUEUE(false) DRI_CONF_RADV_OVERRIDE_GRAPHICS_SHADER_VERSION(0) DRI_CONF_RADV_OVERRIDE_COMPUTE_SHADER_VERSION(0) DRI_CONF_RADV_OVERRIDE_RAY_TRACING_SHADER_VERSION(0) @@ -270,8 +269,6 @@ radv_init_dri_options(struct radv_instance *instance) if (driQueryOptionb(&instance->drirc.options, "radv_rt_wave64")) instance->perftest_flags |= RADV_PERFTEST_RT_WAVE_64; - instance->drirc.disable_dedicated_sparse_queue = driQueryOptionb(&instance->drirc.options, "radv_disable_dedicated_sparse_queue"); - instance->drirc.override_graphics_shader_version = driQueryOptioni(&instance->drirc.options, "radv_override_graphics_shader_version"); instance->drirc.override_compute_shader_version = diff --git a/src/amd/vulkan/radv_instance.h b/src/amd/vulkan/radv_instance.h index 42af8072eb5..9e6b801c53e 100644 --- a/src/amd/vulkan/radv_instance.h +++ b/src/amd/vulkan/radv_instance.h @@ -63,7 +63,6 @@ struct radv_instance { bool tex_non_uniform; bool ssbo_non_uniform; bool flush_before_timestamp_write; - bool disable_dedicated_sparse_queue; bool clear_lds; bool enable_khr_present_wait; bool report_llvm9_version_string; diff --git a/src/amd/vulkan/radv_physical_device.h b/src/amd/vulkan/radv_physical_device.h index 1711152aecb..2a40eda8139 100644 --- a/src/amd/vulkan/radv_physical_device.h +++ b/src/amd/vulkan/radv_physical_device.h @@ -205,11 +205,9 @@ radv_physical_device_instance(const struct radv_physical_device *pdev) static inline bool radv_dedicated_sparse_queue_enabled(const struct radv_physical_device *pdev) { - const struct radv_instance *instance = radv_physical_device_instance(pdev); - /* Dedicated sparse queue requires VK_QUEUE_SUBMIT_MODE_THREADED, which is incompatible with * VK_DEVICE_TIMELINE_MODE_EMULATED. */ - return pdev->info.has_timeline_syncobj && !instance->drirc.disable_dedicated_sparse_queue; + return pdev->info.has_timeline_syncobj; } static inline bool diff --git a/src/amd/vulkan/tests/drirc.cpp b/src/amd/vulkan/tests/drirc.cpp index 4520da079ea..b26b4c9bb62 100644 --- a/src/amd/vulkan/tests/drirc.cpp +++ b/src/amd/vulkan/tests/drirc.cpp @@ -9,19 +9,6 @@ class drirc : public radv_test {}; -TEST_F(drirc, disable_dedicated_sparse_queue) -{ - create_device(); - EXPECT_TRUE(is_dedicated_sparse_queue_enabled()); - destroy_device(); - - add_envvar("radv_disable_dedicated_sparse_queue", "true"); - - create_device(); - EXPECT_FALSE(is_dedicated_sparse_queue_enabled()); - destroy_device(); -} - TEST_F(drirc, override_uniform_offset_alignment) { create_device(); diff --git a/src/util/driconf.h b/src/util/driconf.h index bcad7608c02..0c85c711ae9 100644 --- a/src/util/driconf.h +++ b/src/util/driconf.h @@ -751,10 +751,6 @@ DRI_CONF_OPT_B(radv_rt_wave64, def, \ "Force wave64 in RT shaders") -#define DRI_CONF_RADV_DISABLE_DEDICATED_SPARSE_QUEUE(def) \ - DRI_CONF_OPT_B(radv_disable_dedicated_sparse_queue, def, \ - "Disables the dedicated sparse queue. This replaces radv_legacy_sparse_binding as a compatible drirc workaround for games that might not expect a separate SPARSE queue") - /** * Overrides for forcing re-compilation of pipelines when RADV_BUILD_ID_OVERRIDE is enabled. * These need to be bumped every time a compiler bugfix is backported (up to 8 shader