Mesa (staging/20.1): anv: Translate relative timeout to absolute when calling anv_timelines_wait
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Sat May 16 21:04:20 UTC 2020
Module: Mesa
Branch: staging/20.1
Commit: 644ac80aea814e5343b541acb6313970814b59f3
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=644ac80aea814e5343b541acb6313970814b59f3
Author: Danylo Piliaiev <danylo.piliaiev at globallogic.com>
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 <danylo.piliaiev at globallogic.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
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 bad7a72f838..4a2ae3cd1c5 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1003,7 +1003,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 b9e19617d8a..b00e45e532d 100644
--- a/src/intel/vulkan/anv_queue.c
+++ b/src/intel/vulkan/anv_queue.c
@@ -2330,7 +2330,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);
More information about the mesa-commit
mailing list