tu/msm: Fix timeline semaphore support

Fixes: daefc6e2a40b ("turnip: prep work for timeline semaphore support")
Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25981>
(cherry picked from commit 79b907f9412971b8f6316e1de757a2c3cfdbc603)

diff --git a/.pick_status.json b/.pick_status.json
index e3d7b9490b542ab941a11f1b536e91502a6b3096..4709a458c809cdc4ba719e96aef926643b6e2ca5 100644 (file)
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1254,7 +1254,7 @@
         "description": "tu/msm: Fix timeline semaphore support",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "daefc6e2a40b70f0665b21cf7688e711b4b1ae09",
         "notes": null

diff --git a/src/freedreno/vulkan/tu_knl_drm_msm.cc b/src/freedreno/vulkan/tu_knl_drm_msm.cc
index 3a5e3563bd690194cc7b130f20d603096aa1a246..e8fe7a9f82cc6a3680a82de5d0655fcc5201fe0e 100644 (file)
--- a/src/freedreno/vulkan/tu_knl_drm_msm.cc
+++ b/src/freedreno/vulkan/tu_knl_drm_msm.cc
@@ -1028,6 +1028,7 @@ msm_queue_submit(struct tu_queue *queue, struct vk_queue_submit *submit)
       in_syncobjs[nr_in_syncobjs++] = (struct drm_msm_gem_submit_syncobj) {
          .handle = tu_syncobj_from_vk_sync(sync),
          .flags = 0,
+         .point = submit->waits[i].wait_value,
       };
    }
 
@@ -1037,6 +1038,7 @@ msm_queue_submit(struct tu_queue *queue, struct vk_queue_submit *submit)
       out_syncobjs[nr_out_syncobjs++] = (struct drm_msm_gem_submit_syncobj) {
          .handle = tu_syncobj_from_vk_sync(sync),
          .flags = 0,
+         .point = submit->signals[i].signal_value,
       };
    }