From af8caf1f91e19f2d54c6bfcde5704a403ee6a2b4 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Mon, 22 Feb 2021 13:57:37 +0200 Subject: [PATCH] anv: reset binary syncobj to be signaled before submission Before we introduced the submission thread in 829699ba632b2b, once we returned from vkQueueSubmit, all signaled syncobj would have a i915_request/dma-fence waiting to be signaled by some work that would submitted to HW by i915. After this submission thread that is no longer the case. We added a few checks in places like vkQueuePresentKHR() to wait for the binary semaphores to materialize before we would hand things over to the WSI code. Unfortunately 829699ba632b2b forgot to reset the signaled binary semaphore. Signed-off-by: Lionel Landwerlin Fixes: 829699ba632b2b ("anv: implement shareable timeline semaphores") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4276 Reviewed-by: Jason Ekstrand Part-of: (cherry picked from commit cb74cd816c0a0b1d6a715585414f8518cefbba5a) --- .pick_status.json | 2 +- src/intel/vulkan/anv_queue.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 2125ba50869..e4d250998da 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2335,7 +2335,7 @@ "description": "anv: reset binary syncobj to be signaled before submission", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "829699ba632b2b78e4de372baf42ae01095158a7" }, diff --git a/src/intel/vulkan/anv_queue.c b/src/intel/vulkan/anv_queue.c index 1b0f7d732e2..3fcd1ea0f8c 100644 --- a/src/intel/vulkan/anv_queue.c +++ b/src/intel/vulkan/anv_queue.c @@ -1054,6 +1054,13 @@ anv_queue_submit(struct anv_queue *queue, break; case ANV_SEMAPHORE_TYPE_DRM_SYNCOBJ: { + /* + * Reset the content of the syncobj so it doesn't contain a + * previously signaled dma-fence, until one is added by EXECBUFFER by + * the submission thread. + */ + anv_gem_syncobj_reset(device, impl->syncobj); + result = anv_queue_submit_add_syncobj(submit, device, impl->syncobj, I915_EXEC_FENCE_SIGNAL, 0);