From b9f4c615f860b1fb00dec2917fcec4df84f6427e Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Thu, 4 Jan 2018 02:55:39 +0100 Subject: [PATCH] radv: reset semaphores & fences on sync_file export. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Per spec: "Additionally, exporting a fence payload to a handle with copy transference has the same side effects on the source fence’s payload as executing a fence reset operation. If the fence was using a temporarily imported payload, the fence’s prior permanent payload will be restored." And similar for semaphores: "Additionally, exporting a semaphore payload to a handle with copy transference has the same side effects on the source semaphore’s payload as executing a semaphore wait operation. If the semaphore was using a temporarily imported payload, the semaphore’s prior permanent payload will be restored." Fixes: 42bc25a79c "radv: Advertise sync fd import and export." Reviewed-by: Dave Airlie --- src/amd/vulkan/radv_device.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 24aa8617809..55ffebb20ac 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -3815,6 +3815,14 @@ VkResult radv_GetSemaphoreFdKHR(VkDevice _device, break; case VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT_KHR: ret = device->ws->export_syncobj_to_sync_file(device->ws, syncobj_handle, pFd); + if (!ret) { + if (sem->temp_syncobj) { + close (sem->temp_syncobj); + sem->temp_syncobj = 0; + } else { + device->ws->reset_syncobj(device->ws, syncobj_handle); + } + } break; default: unreachable("Unhandled semaphore handle type"); @@ -3896,6 +3904,14 @@ VkResult radv_GetFenceFdKHR(VkDevice _device, break; case VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT_KHR: ret = device->ws->export_syncobj_to_sync_file(device->ws, syncobj_handle, pFd); + if (!ret) { + if (fence->temp_syncobj) { + close (fence->temp_syncobj); + fence->temp_syncobj = 0; + } else { + device->ws->reset_syncobj(device->ws, syncobj_handle); + } + } break; default: unreachable("Unhandled fence handle type"); -- 2.30.2