From 395b5069129b1a8777b9dfb7bb6f7c151ac26320 Mon Sep 17 00:00:00 2001 From: Mary Guillemard Date: Mon, 27 May 2024 09:39:22 +0200 Subject: [PATCH] panvk: Advertise VK_KHR_maintenance3 We already support everything needed for maintenace3. Signed-off-by: Mary Guillemard Reviewed-by: Boris Brezillon Part-of: --- docs/features.txt | 2 +- src/panfrost/ci/deqp-panfrost-g52-vk.toml | 1 + src/panfrost/vulkan/panvk_physical_device.c | 5 ++--- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/features.txt b/docs/features.txt index 1b9f446a59c..378209406df 100644 --- a/docs/features.txt +++ b/docs/features.txt @@ -438,7 +438,7 @@ Vulkan 1.1 -- all DONE: anv, lvp, nvk, radv, tu, vn VK_KHR_get_physical_device_properties2 DONE (anv, dzn, hasvk, lvp, nvk, panvk, pvr, radv, tu, v3dv, vn) VK_KHR_maintenance1 DONE (anv, dzn, hasvk, lvp, nvk, radv, tu, v3dv, vn) VK_KHR_maintenance2 DONE (anv, dzn, hasvk, lvp, nvk, radv, tu, v3dv, vn) - VK_KHR_maintenance3 DONE (anv, dzn, hasvk, lvp, nvk, radv, tu, v3dv, vn) + VK_KHR_maintenance3 DONE (anv, dzn, hasvk, lvp, nvk, panvk, radv, tu, v3dv, vn) VK_KHR_multiview DONE (anv, dzn, hasvk, lvp, nvk, radv, tu, v3dv, vn) VK_KHR_relaxed_block_layout DONE (anv, dzn, hasvk, lvp, nvk, radv, tu, v3dv, vn) VK_KHR_sampler_ycbcr_conversion DONE (anv, hasvk, lvp, nvk, radv, tu, v3dv, vn) diff --git a/src/panfrost/ci/deqp-panfrost-g52-vk.toml b/src/panfrost/ci/deqp-panfrost-g52-vk.toml index 4b886092fd9..33f4336d9a7 100644 --- a/src/panfrost/ci/deqp-panfrost-g52-vk.toml +++ b/src/panfrost/ci/deqp-panfrost-g52-vk.toml @@ -13,6 +13,7 @@ include = [ "dEQP-VK.api.command_buffers.render_pass_continue_no_fb", "dEQP-VK.api.copy_and_blit.core.*", "dEQP-VK.api.fill_and_update_buffer.suballocation.*", + "dEQP-VK.api.maintenance3_check.*", "dEQP-VK.binding_model.buffer_device_address.*", "dEQP-VK.binding_model.descriptor_copy.compute.*", "dEQP-VK.compute.builtin_var.*", diff --git a/src/panfrost/vulkan/panvk_physical_device.c b/src/panfrost/vulkan/panvk_physical_device.c index d389db6cb91..7b00a34fb85 100644 --- a/src/panfrost/vulkan/panvk_physical_device.c +++ b/src/panfrost/vulkan/panvk_physical_device.c @@ -68,6 +68,7 @@ get_device_extensions(const struct panvk_physical_device *device, .KHR_device_group = true, .KHR_descriptor_update_template = true, .KHR_driver_properties = true, + .KHR_maintenance3 = true, .KHR_pipeline_executable_properties = true, .KHR_pipeline_library = true, .KHR_push_descriptor = true, @@ -468,9 +469,7 @@ get_device_properties(const struct panvk_instance *instance, .maxMultiviewViewCount = 0, .maxMultiviewInstanceIndex = 0, .protectedNoFault = false, - /* Make sure everything is addressable by a signed 32-bit int, and - * our largest descriptors are 96 bytes. */ - .maxPerSetDescriptors = (1ull << 31) / 96, + .maxPerSetDescriptors = UINT16_MAX, /* Our buffer size fields allow only this much */ .maxMemoryAllocationSize = UINT32_MAX,