From 246c6ec7ab6183e1046cddd8eda8c7cea4e2d423 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Thu, 22 Apr 2021 23:04:47 -0400
Subject: [PATCH] zink: restore previous semaphore (prev_sem) handling

this was accidentally lost during refactoring

Fixes: fa36a16c684 ("zink: make timeline semaphores per-screen")

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10421>
(cherry picked from commit 67d22bd8e0b764c69f60e361a3a1425750823ff3)
---
 .pick_status.json                      | 2 +-
 src/gallium/drivers/zink/zink_screen.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 089eb63ca8f..bcce1ddc543 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -418,7 +418,7 @@
         "description": "zink: restore previous semaphore (prev_sem) handling",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "fa36a16c68489c7a8a7223c39fb0078f7d745bcb"
     },
diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index 7b2c0d3822d..ccf1b47300b 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -1349,6 +1349,7 @@ zink_screen_init_semaphore(struct zink_screen *screen)
        */
       if (screen->prev_sem)
          vkDestroySemaphore(screen->dev, screen->prev_sem, NULL);
+      screen->prev_sem = screen->sem;
       screen->sem = sem;
       return true;
    }