commit f335158cfa4faf366de88fd04d83e6fb0279b14a
author Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Mon Jul 07 11:07:53 2025 -0400
committer Marge Bot <marge-bot@fdo.invalid> Mon Jul 07 15:21:27 2025 +0000
tree f1b2343636d80186422d961fcb877af0dbb1de8d
parent de9b4f1ae5d0e7d0264c61130c7299b49d8d050e

zink: always insert current batch sparse semaphore into sparse wait chain

this avoids desync in the case where a batch performs multiple distinct
sparse commit operations

cc: mesa-stable

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

src/gallium/drivers/zink/zink_bo.c

diff --git a/src/gallium/drivers/zink/zink_bo.c b/src/gallium/drivers/zink/zink_bo.c
index 21a0191..be67b2c 100644
--- a/src/gallium/drivers/zink/zink_bo.c
+++ b/src/gallium/drivers/zink/zink_bo.c
@@ -805,7 +805,7 @@
 
    uint32_t va_page = offset / ZINK_SPARSE_BUFFER_PAGE_SIZE;
    uint32_t end_va_page = va_page + DIV_ROUND_UP(size, ZINK_SPARSE_BUFFER_PAGE_SIZE);
-   VkSemaphore cur_sem = VK_NULL_HANDLE;
+   VkSemaphore cur_sem = *sem;
    if (commit) {
       while (va_page < end_va_page) {
          uint32_t span_va_page;