From 9f5e19e05ab6585dfd138b8ad8b00f9b50d609f1 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Tue, 14 Apr 2026 11:46:51 +0200 Subject: [PATCH] panvk: do not enable extension without required feature The Vulkan spec states that if VK_KHR_shader_clock is supported, shaderSubgroupClock is a required feature. So let's not enable that extension unless we can... Fixes: e9c2c324094 ("panvk: enable VK_KHR_shader_clock") Reviewed-by: Christoph Pillmayer Reviewed-by: Ashley Smith Reviewed-by: Daniel Stone (cherry picked from commit c8ae72f51d5bdea0472b059d382769c3421a066a) Part-of: --- .pick_status.json | 2 +- src/panfrost/ci/panfrost-g52-fails.txt | 1 - src/panfrost/vulkan/panvk_vX_physical_device.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index ffa142b90ba..97b4ad87b87 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -4034,7 +4034,7 @@ "description": "panvk: do not enable extension without required feature", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "e9c2c3240949196a5584ed1c54df4b9bb75dcbf3", "notes": null diff --git a/src/panfrost/ci/panfrost-g52-fails.txt b/src/panfrost/ci/panfrost-g52-fails.txt index e1969ea188f..60268bdb702 100644 --- a/src/panfrost/ci/panfrost-g52-fails.txt +++ b/src/panfrost/ci/panfrost-g52-fails.txt @@ -349,7 +349,6 @@ dEQP-VK.pipeline.pipeline_library.empty_fs.masked_samples,Fail # New failures with VKCTS 1.4.4.0 dEQP-VK.binding_model.unused_invalid_descriptor.write.invalid.combined_image_sampler,Crash dEQP-VK.binding_model.unused_invalid_descriptor.write.invalid.sampled_image,Crash -dEQP-VK.info.device_mandatory_features,Fail dEQP-VK.pipeline.fast_linked_library.vertex_input.misc.unbound_input,Crash dEQP-VK.pipeline.fast_linked_library.vertex_input.misc.unbound_input_dynamic,Crash dEQP-VK.pipeline.monolithic.vertex_input.misc.unbound_input,Crash diff --git a/src/panfrost/vulkan/panvk_vX_physical_device.c b/src/panfrost/vulkan/panvk_vX_physical_device.c index 6fe5783249b..043174fdf39 100644 --- a/src/panfrost/vulkan/panvk_vX_physical_device.c +++ b/src/panfrost/vulkan/panvk_vX_physical_device.c @@ -95,7 +95,7 @@ panvk_per_arch(get_physical_device_extensions)( .KHR_sampler_mirror_clamp_to_edge = true, .KHR_sampler_ycbcr_conversion = true, .KHR_separate_depth_stencil_layouts = true, - .KHR_shader_clock = true, + .KHR_shader_clock = device->kmod.dev->props.gpu_can_query_timestamp, .KHR_shader_draw_parameters = true, .KHR_shader_expect_assume = true, .KHR_shader_float_controls = true,