From c8ae72f51d5bdea0472b059d382769c3421a066a 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 Part-of: --- src/panfrost/ci/panfrost-g52-fails.txt | 1 - src/panfrost/vulkan/panvk_vX_physical_device.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/panfrost/ci/panfrost-g52-fails.txt b/src/panfrost/ci/panfrost-g52-fails.txt index 4af0a9bee64..cd14890d88d 100644 --- a/src/panfrost/ci/panfrost-g52-fails.txt +++ b/src/panfrost/ci/panfrost-g52-fails.txt @@ -310,7 +310,6 @@ dEQP-VK.api.device_init.create_device_global_priority_query_khr.basic,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 f1b63c0ef18..fcc1f11f87c 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,