zink: Fix missing sparse buffer bind synchronization.

goto oopsies.

Fixes: d1456a6b0ad ("zink: add semaphore handling for sparse binds")
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26171>
(cherry picked from commit 3ee283e45557066c29fdb2000f7627d8996aeed0)

diff --git a/.pick_status.json b/.pick_status.json
index a264889..74002f0 100644 (file)
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1314,7 +1314,7 @@
         "description": "zink: Fix missing sparse buffer bind synchronization.",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "d1456a6b0ad0dee9936caa52c9fd915c4bfaa61b",
         "notes": null

diff --git a/src/gallium/drivers/zink/zink_bo.c b/src/gallium/drivers/zink/zink_bo.c
index 7fd2bd4..0194974 100644 (file)
--- a/src/gallium/drivers/zink/zink_bo.c
+++ b/src/gallium/drivers/zink/zink_bo.c
@@ -959,7 +959,7 @@ zink_bo_commit(struct zink_screen *screen, struct zink_resource *res, unsigned l
    simple_mtx_lock(&screen->queue_lock);
    simple_mtx_lock(&bo->lock);
    if (res->base.b.target == PIPE_BUFFER) {
-      ok = buffer_bo_commit(screen, res, box->x, box->width, commit, sem);
+      ok = buffer_bo_commit(screen, res, box->x, box->width, commit, &cur_sem);
       goto out;
    }