From 904811faacc8cb88229be084e10f4fe3131af796 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 16 Nov 2020 10:02:17 +1000
Subject: [PATCH] lavapipe: fix wsi acquire fences

Fixes:
dEQP-VK.wsi.xcb.swapchain.acquire.too_many

Cc: "20.3" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7705>
(cherry picked from commit f24645653863564eb059c1200a52b25f659216e5)
---
 .pick_status.json                        |  2 +-
 src/gallium/frontends/lavapipe/lvp_wsi.c | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 9569b5321a2..06cbd3c8fb3 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -634,7 +634,7 @@
         "description": "lavapipe: fix wsi acquire fences",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/frontends/lavapipe/lvp_wsi.c b/src/gallium/frontends/lavapipe/lvp_wsi.c
index 95aad8ce532..54964bf4b66 100644
--- a/src/gallium/frontends/lavapipe/lvp_wsi.c
+++ b/src/gallium/frontends/lavapipe/lvp_wsi.c
@@ -213,19 +213,12 @@ VkResult lvp_AcquireNextImage2KHR(
                                                     _device,
                                                     pAcquireInfo,
                                                     pImageIndex);
-#if 0
+
    LVP_FROM_HANDLE(lvp_fence, fence, pAcquireInfo->fence);
 
    if (fence && (result == VK_SUCCESS || result == VK_SUBOPTIMAL_KHR)) {
-      if (fence->fence)
-         device->ws->signal_fence(fence->fence);
-      if (fence->temp_syncobj) {
-         device->ws->signal_syncobj(device->ws, fence->temp_syncobj);
-      } else if (fence->syncobj) {
-         device->ws->signal_syncobj(device->ws, fence->syncobj);
-      }
+      fence->signaled = true;
    }
-#endif
    return result;
 }