radv: Implement VK_KHR_external_fence_fd.

Reviewed-by: Dave Airlie <airlied@redhat.com>

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index fc9fb59f9916db1fb95df902022c9411ede31cdf..94562fda8757166877f5f50470416691b405ec03 100644 (file)
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -3746,3 +3746,50 @@ void radv_GetPhysicalDeviceExternalSemaphorePropertiesKHR(
                pExternalSemaphoreProperties->externalSemaphoreFeatures = 0;
        }
 }
+
+VkResult radv_ImportFenceFdKHR(VkDevice _device,
+                                  const VkImportFenceFdInfoKHR *pImportFenceFdInfo)
+{
+       RADV_FROM_HANDLE(radv_device, device, _device);
+       RADV_FROM_HANDLE(radv_fence, fence, pImportFenceFdInfo->fence);
+       uint32_t syncobj_handle = 0;
+       uint32_t *syncobj_dst = NULL;
+       assert(pImportFenceFdInfo->handleType == VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_FD_BIT_KHR);
+
+       int ret = device->ws->import_syncobj(device->ws, pImportFenceFdInfo->fd, &syncobj_handle);
+       if (ret != 0)
+               return vk_error(VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR);
+
+       if (pImportFenceFdInfo->flags & VK_FENCE_IMPORT_TEMPORARY_BIT_KHR) {
+               syncobj_dst = &fence->temp_syncobj;
+       } else {
+               syncobj_dst = &fence->syncobj;
+       }
+
+       if (*syncobj_dst)
+               device->ws->destroy_syncobj(device->ws, *syncobj_dst);
+
+       *syncobj_dst = syncobj_handle;
+       close(pImportFenceFdInfo->fd);
+       return VK_SUCCESS;
+}
+
+VkResult radv_GetFenceFdKHR(VkDevice _device,
+                               const VkFenceGetFdInfoKHR *pGetFdInfo,
+                               int *pFd)
+{
+       RADV_FROM_HANDLE(radv_device, device, _device);
+       RADV_FROM_HANDLE(radv_fence, fence, pGetFdInfo->fence);
+       int ret;
+       uint32_t syncobj_handle;
+
+       assert(pGetFdInfo->handleType == VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_FD_BIT_KHR);
+       if (fence->temp_syncobj)
+               syncobj_handle = fence->temp_syncobj;
+       else
+               syncobj_handle = fence->syncobj;
+       ret = device->ws->export_syncobj(device->ws, syncobj_handle, pFd);
+       if (ret)
+               return vk_error(VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR);
+       return VK_SUCCESS;
+}

diff --git a/src/amd/vulkan/radv_extensions.py b/src/amd/vulkan/radv_extensions.py
index 2c1c71ecdc7efabb605b322f08cd4de9c43cfad7..3188735ea78dd958483d421503cefe954d1b2dd8 100644 (file)
--- a/src/amd/vulkan/radv_extensions.py
+++ b/src/amd/vulkan/radv_extensions.py
@@ -53,6 +53,7 @@ EXTENSIONS = [
     Extension('VK_KHR_bind_memory2',                      1, True),
     Extension('VK_KHR_dedicated_allocation',              1, True),
     Extension('VK_KHR_descriptor_update_template',        1, True),
+    Extension('VK_KHR_external_fence_fd',                 1, 'device->rad_info.has_syncobj_wait'),
     Extension('VK_KHR_external_memory',                   1, True),
     Extension('VK_KHR_external_memory_capabilities',      1, True),
     Extension('VK_KHR_external_memory_fd',                1, True),