Mesa (staging/20.1): anv: Fix deadlock in anv_timelines_wait

[GitLab Mirror]

Module: Mesa
Branch: staging/20.1
Commit: df832672e86cee3b9b080ea081b42c2f38bf9846
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=df832672e86cee3b9b080ea081b42c2f38bf9846

Author: Danylo Piliaiev <danylo.piliaiev at globallogic.com>
Date:   Tue May 12 12:27:58 2020 +0300

anv: Fix deadlock in anv_timelines_wait

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/2945
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/5005>
(cherry picked from commit 06b6c687e2aba075e9fc3812d80c128bd873bbce)

---

 .pick_status.json            | 2 +-
 src/intel/vulkan/anv_queue.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 4a2ae3cd1c5..80ce86565cd 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -787,7 +787,7 @@
         "description": "anv: Fix deadlock in 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 b00e45e532d..09b51f1bef2 100644
--- a/src/intel/vulkan/anv_queue.c
+++ b/src/intel/vulkan/anv_queue.c
@@ -2238,9 +2238,10 @@ anv_timelines_wait(struct anv_device *device,
                    uint64_t abs_timeout_ns)
 {
    if (!wait_all && n_timelines > 1) {
+      pthread_mutex_lock(&device->mutex);
+
       while (1) {
          VkResult result;
-         pthread_mutex_lock(&device->mutex);
          for (uint32_t i = 0; i < n_timelines; i++) {
             result =
                anv_timeline_wait_locked(device, timelines[i], serials[i], 0);