From dfc5d76205162ca6862bec083538cd0e48a420c3 Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Sun, 8 Feb 2026 22:16:59 -0800 Subject: [PATCH] venus: rename format_update_mutex for general purpose Not worth separate locks for physical device level queries. Part-of: --- src/virtio/vulkan/vn_physical_device.c | 8 ++++---- src/virtio/vulkan/vn_physical_device.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/virtio/vulkan/vn_physical_device.c b/src/virtio/vulkan/vn_physical_device.c index 30b58c43da7..f8e670dadd3 100644 --- a/src/virtio/vulkan/vn_physical_device.c +++ b/src/virtio/vulkan/vn_physical_device.c @@ -1705,7 +1705,7 @@ vn_physical_device_init(struct vn_physical_device *physical_dev) if (result != VK_SUCCESS) goto fail; - simple_mtx_init(&physical_dev->format_update_mutex, mtx_plain); + simple_mtx_init(&physical_dev->mutex, mtx_plain); util_sparse_array_init(&physical_dev->format_properties, sizeof(struct vn_format_properties_entry), 64); @@ -1726,7 +1726,7 @@ vn_physical_device_fini(struct vn_physical_device *physical_dev) vn_image_format_cache_fini(physical_dev); - simple_mtx_destroy(&physical_dev->format_update_mutex); + simple_mtx_destroy(&physical_dev->mutex); util_sparse_array_finish(&physical_dev->format_properties); vn_wsi_fini(physical_dev); @@ -2282,7 +2282,7 @@ vn_GetPhysicalDeviceFormatProperties2(VkPhysicalDevice physicalDevice, pFormatProperties); vn_sanitize_format_properties(format, props, props3); - simple_mtx_lock(&physical_dev->format_update_mutex); + simple_mtx_lock(&physical_dev->mutex); if (entry && !entry->valid) { assert(cacheable); entry->props = *props; @@ -2292,7 +2292,7 @@ vn_GetPhysicalDeviceFormatProperties2(VkPhysicalDevice physicalDevice, entry->srpq = *srpq; entry->valid = true; } - simple_mtx_unlock(&physical_dev->format_update_mutex); + simple_mtx_unlock(&physical_dev->mutex); } struct vn_physical_device_image_format_info { diff --git a/src/virtio/vulkan/vn_physical_device.h b/src/virtio/vulkan/vn_physical_device.h index 9ed67bcc3e3..07a51648bb8 100644 --- a/src/virtio/vulkan/vn_physical_device.h +++ b/src/virtio/vulkan/vn_physical_device.h @@ -129,7 +129,7 @@ struct vn_physical_device { struct wsi_device wsi_device; - simple_mtx_t format_update_mutex; + simple_mtx_t mutex; struct util_sparse_array format_properties; struct vn_image_format_properties_cache image_format_cache;