Module: Mesa Branch: staging/20.0 Commit: 6b4950f2d37dae0391259c9688d1294fb3a3d4a8 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6b4950f2d37dae0391259c9688d1294fb3a3d4a8
Author: Danylo Piliaiev <[email protected]> Date: Wed May 13 19:28:59 2020 +0300 anv: Translate relative timeout to absolute when calling anv_timelines_wait Fixes: 34f32a6d6648073e2fda3fb78377124fb32bb288 Signed-off-by: Danylo Piliaiev <[email protected]> Reviewed-by: Lionel Landwerlin <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5025> (cherry picked from commit 15dd7933bc33bb13d146f9e0a1f79092e749f33b) --- .pick_status.json | 2 +- src/intel/vulkan/anv_queue.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index b38da88ed76..78b0aa0e85f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -445,7 +445,7 @@ "description": "anv: Translate relative timeout to absolute when calling anv_timelines_wait", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "34f32a6d6648073e2fda3fb78377124fb32bb288" }, diff --git a/src/intel/vulkan/anv_queue.c b/src/intel/vulkan/anv_queue.c index b93d070711d..da52d02804f 100644 --- a/src/intel/vulkan/anv_queue.c +++ b/src/intel/vulkan/anv_queue.c @@ -2318,7 +2318,7 @@ VkResult anv_WaitSemaphores( if (handle_count > 0) { result = anv_timelines_wait(device, timelines, values, handle_count, !(pWaitInfo->flags & VK_SEMAPHORE_WAIT_ANY_BIT_KHR), - timeout); + anv_get_absolute_timeout(timeout)); } vk_free(&device->alloc, timelines); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
