fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 00:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

venus: prepare chain access for async present

Browse source 
During async presentation, swapchain is accessed by the async present
thread. With proper queue and chain access locks within venus driver,
we still have to rely on mesa common wsi implementation specifics for
optimal async present performance:

Below need to be protected:
- vkAcquireNextImage2KHR
- vkDestroySwapchainKHR

Below are safe:
- vkGetSwapchainImagesKHR
- vkWaitForPresentKHR
- vkWaitForPresent2KHR
- vkReleaseSwapchainImagesKHR
- VkSwapchainPresentFenceInfoKHR::pFences

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39283>
This commit is contained in:
Yiwei Zhang 2026-01-06 21:59:49 -08:00 • committed by Marge Bot
parent ca18b73669
commit 0a2525491d
1 changed files with 43 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/virtio/vulkan/vn_wsi.c
View file

@ -57,10 +57,32 @@
struct vn_swapchain {
VkSwapchainKHR handle;
/* lock chain access */
simple_mtx_t mutex;
/* sub-lock for image acquire */
simple_mtx_t acquire_mutex;
struct list_head head;
};
static struct vn_swapchain *
vn_wsi_chain_lookup(struct vn_device *dev, VkSwapchainKHR swapchain)
{
struct vn_swapchain *chain = NULL;
simple_mtx_lock(&dev->mutex);
list_for_each_entry(struct vn_swapchain, entry, &dev->chains, head) {
if (entry->handle == swapchain) {
chain = entry;
break;
}
}
simple_mtx_unlock(&dev->mutex);
assert(chain);
return chain;
}
static VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL
vn_wsi_proc_addr(VkPhysicalDevice physicalDevice, const char *pName)
{
@ -290,6 +312,8 @@ vn_CreateSwapchainKHR(VkDevice device,
}
chain->handle = *pSwapchain;
simple_mtx_init(&chain->mutex, mtx_plain);
simple_mtx_init(&chain->acquire_mutex, mtx_plain);
simple_mtx_lock(&dev->mutex);
list_add(&chain->head, &dev->chains);
@ -305,22 +329,23 @@ vn_DestroySwapchainKHR(VkDevice device,
{
VN_TRACE_FUNC();
struct vn_device *dev = vn_device_from_handle(device);
struct vn_swapchain *chain = NULL;
if (swapchain == VK_NULL_HANDLE)
return;
struct vn_swapchain *chain = vn_wsi_chain_lookup(dev, swapchain);
/* lock/unlock to wait for async present thread to release chain access */
simple_mtx_lock(&chain->mutex);
simple_mtx_unlock(&chain->mutex);
simple_mtx_lock(&dev->mutex);
list_for_each_entry(struct vn_swapchain, entry, &dev->chains, head) {
if (entry->handle == swapchain) {
list_del(&entry->head);
chain = entry;
break;
}
}
list_del(&chain->head);
simple_mtx_unlock(&dev->mutex);
assert(chain);
/* now safe to do swapchain tear down */
simple_mtx_destroy(&chain->acquire_mutex);
simple_mtx_destroy(&chain->mutex);
vk_free2(&dev->base.vk.alloc, pAllocator, chain);
return wsi_DestroySwapchainKHR(device, swapchain, pAllocator);
@ -333,9 +358,16 @@ vn_AcquireNextImage2KHR(VkDevice device,
{
VN_TRACE_FUNC();
struct vn_device *dev = vn_device_from_handle(device);
VkResult result;
struct vn_swapchain *chain =
vn_wsi_chain_lookup(dev, pAcquireInfo->swapchain);
simple_mtx_lock(&chain->acquire_mutex);
result = wsi_common_acquire_next_image2(&dev->physical_device->wsi_device,
device, pAcquireInfo, pImageIndex);
simple_mtx_unlock(&chain->acquire_mutex);
VkResult result = wsi_common_acquire_next_image2(
&dev->physical_device->wsi_device, device, pAcquireInfo, pImageIndex);
if (VN_DEBUG(WSI) && result != VK_SUCCESS) {
const int idx = result >= VK_SUCCESS ? *pImageIndex : -1;
vn_log(dev->instance, "swapchain %p: acquired image %d: %s",