From c573f2437dfe040ed993ed44f8a9fd6aa00466b7 Mon Sep 17 00:00:00 2001 From: Tatsuyuki Ishi Date: Mon, 13 Nov 2023 17:39:20 +0900 Subject: [PATCH] zink: Fix missing sparse buffer bind synchronization. goto oopsies. Fixes: d1456a6b0ad ("zink: add semaphore handling for sparse binds") Reviewed-by: Dave Airlie Part-of: (cherry picked from commit 3ee283e45557066c29fdb2000f7627d8996aeed0) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_bo.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index a264889..74002f05 100644 --- 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 --- 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; } -- 2.7.4