diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 5d4d6903df9..5fb48b01825 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -1378,11 +1378,6 @@ radv_CreateDevice(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo *pCr device->capture_replay_arena_vas = _mesa_hash_table_u64_create(NULL); } - if (pdev->info.gfx_level == GFX11 && pdev->info.has_dedicated_vram && instance->drirc.force_pstate_peak_gfx11_dgpu) { - if (!radv_device_acquire_performance_counters(device)) - fprintf(stderr, "radv: failed to set pstate to profile_peak.\n"); - } - *pDevice = radv_device_to_handle(device); return VK_SUCCESS; diff --git a/src/amd/vulkan/radv_instance.c b/src/amd/vulkan/radv_instance.c index 8104a18d836..e25f9a5312c 100644 --- a/src/amd/vulkan/radv_instance.c +++ b/src/amd/vulkan/radv_instance.c @@ -186,7 +186,6 @@ static const driOptionDescription radv_dri_options[] = { 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_FORCE_PSTATE_PEAK_GFX11_DGPU(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) @@ -262,9 +261,6 @@ radv_init_dri_options(struct radv_instance *instance) instance->drirc.disable_dedicated_sparse_queue = driQueryOptionb(&instance->drirc.options, "radv_disable_dedicated_sparse_queue"); - instance->drirc.force_pstate_peak_gfx11_dgpu = - driQueryOptionb(&instance->drirc.options, "radv_force_pstate_peak_gfx11_dgpu"); - 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 162abf2febd..c5a4d0630ca 100644 --- a/src/amd/vulkan/radv_instance.h +++ b/src/amd/vulkan/radv_instance.h @@ -64,7 +64,6 @@ struct radv_instance { bool ssbo_non_uniform; bool flush_before_timestamp_write; bool disable_dedicated_sparse_queue; - bool force_pstate_peak_gfx11_dgpu; bool clear_lds; bool enable_khr_present_wait; bool report_llvm9_version_string; diff --git a/src/util/00-radv-defaults.conf b/src/util/00-radv-defaults.conf index e3067464ab1..3a01571d3e1 100644 --- a/src/util/00-radv-defaults.conf +++ b/src/util/00-radv-defaults.conf @@ -171,10 +171,6 @@ Application bugs worked around in this file: