commit 0df0449b65c5502040c17d9639e02f76f0bb39ab
author Iago Toral Quiroga <itoral@igalia.com> Mon Sep 07 11:09:23 2020 +0200
committer Marge Bot <eric+marge@anholt.net> Tue Oct 13 21:21:33 2020 +0000
tree 3c3a9848de4bbdd7840fbc53df569b75cd8b193c
parent e14cdd6eba1bf19e7186cf236ba36a385fc29850

v3dv: signal semaphore/fence if needed after acquiring a swapchain image

Fixes:
dEQP-VK.wsi.*.swapchain.acquire.too_many
dEQP-VK.wsi.*.swapchain.acquire.too_many_timeout

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6766>

src/broadcom/vulkan/v3dv_wsi.c

diff --git a/src/broadcom/vulkan/v3dv_wsi.c b/src/broadcom/vulkan/v3dv_wsi.c
index c47a51a..fec8039 100644
--- a/src/broadcom/vulkan/v3dv_wsi.c
+++ b/src/broadcom/vulkan/v3dv_wsi.c
@@ -243,10 +243,23 @@
     uint32_t*                                    pImageIndex)
 {
    V3DV_FROM_HANDLE(v3dv_device, device, _device);
+   V3DV_FROM_HANDLE(v3dv_fence, fence, pAcquireInfo->fence);
+   V3DV_FROM_HANDLE(v3dv_semaphore, semaphore, pAcquireInfo->semaphore);
+
    struct v3dv_physical_device *pdevice = &device->instance->physicalDevice;
 
-   return wsi_common_acquire_next_image2(&pdevice->wsi_device, _device,
-                                         pAcquireInfo, pImageIndex);
+   VkResult result;
+   result = wsi_common_acquire_next_image2(&pdevice->wsi_device, _device,
+                                           pAcquireInfo, pImageIndex);
+
+   if (result == VK_SUCCESS || result == VK_SUBOPTIMAL_KHR) {
+      if (fence)
+         drmSyncobjSignal(device->render_fd, &fence->sync, 1);
+      if (semaphore)
+         drmSyncobjSignal(device->render_fd, &semaphore->sync, 1);
+   }
+
+   return result;
 }
 
 VkResult v3dv_QueuePresentKHR(