From 6c1358b0248eb3a07d999ec2d20dab0cc42c25eb Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Tue, 28 Jul 2020 04:14:23 +0200 Subject: [PATCH] radv: Fix host->host signalling with legacy timeline semaphores. Fixes: 88d41367b8a "radv: Add timelines with a VK_KHR_timeline_semaphore impl." Reviewed-by: Dave Airlie Tested-by: Andres Rodriguez Part-of: (cherry picked from commit 05b278327066304d8822eb6414a89120c816e14a) --- .pick_status.json | 2 +- src/amd/vulkan/radv_device.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index d1f17e3ac26..3943d0d4d34 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2902,7 +2902,7 @@ "description": "radv: Fix host->host signalling with legacy timeline semaphores.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "88d41367b8aee961e6c47173a1e8848009e2215a" }, diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index d131f3d39b4..803f48e6664 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -6215,7 +6215,16 @@ radv_SignalSemaphore(VkDevice _device, radv_timeline_trigger_waiters_locked(&part->timeline, &processing_list); pthread_mutex_unlock(&part->timeline.mutex); - return radv_process_submissions(&processing_list); + VkResult result = radv_process_submissions(&processing_list); + + /* This needs to happen after radv_process_submissions, so + * that any submitted submissions that are now unblocked get + * processed before we wake the application. This way we + * ensure that any binary semaphores that are now unblocked + * are usable by the application. */ + pthread_cond_broadcast(&device->timeline_cond); + + return result; } case RADV_SEMAPHORE_NONE: case RADV_SEMAPHORE_SYNCOBJ: