From f890b515ef2a570e3d4a1f9466521e7bb0869bea Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Thu, 22 Feb 2024 19:53:04 -0600 Subject: [PATCH] nvk: Don't use WAIT_AVAILABLE in nvk_upload_queue_sync This was a copy+paste error, probably from vk_drm_syncobj.c. If we do WAIT_AVAILABLE, it only waits for the dma_fence to exist, not for it to signal. Instead, we want WAIT_FOR_SUBMIT. (Technically, that's not necessary but it is typical for CPU waits to also wait for the time point to materialize.) Fixes: 2074e28a0d6a ("nvk: Add an upload queue") Part-of: --- src/nouveau/vulkan/nvk_upload_queue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nouveau/vulkan/nvk_upload_queue.c b/src/nouveau/vulkan/nvk_upload_queue.c index eb68f6e1835..bb4d524af43 100644 --- a/src/nouveau/vulkan/nvk_upload_queue.c +++ b/src/nouveau/vulkan/nvk_upload_queue.c @@ -198,7 +198,7 @@ nvk_upload_queue_sync_locked(struct nvk_device *dev, int err = drmSyncobjTimelineWait(dev->ws_dev->fd, &queue->drm.syncobj, &queue->last_time_point, 1, INT64_MAX, - DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE, + DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT, NULL); if (err != 0) return vk_device_set_lost(&dev->vk, "DRM_IOCTL_SYNCOBJ_WAIT failed: %m");