From 3a4024e776645714dc728e48108755877b37131a Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Sat, 18 Jul 2020 22:51:44 +0300 Subject: [PATCH] anv: properly handle fence import of sync_fd = -1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Lionel Landwerlin Fixes: 43e8808b82b9eb ("anv: Add support for the SYNC_FD handle type for fences") Reviewed-by: Tapani Pälli Part-of: --- src/intel/vulkan/anv_queue.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/intel/vulkan/anv_queue.c b/src/intel/vulkan/anv_queue.c index f997391bdb6..7ba64af54c4 100644 --- a/src/intel/vulkan/anv_queue.c +++ b/src/intel/vulkan/anv_queue.c @@ -1633,23 +1633,35 @@ VkResult anv_ImportFenceFdKHR( break; - case VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT: + case VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT: { /* Sync files are a bit tricky. Because we want to continue using the * syncobj implementation of WaitForFences, we don't use the sync file * directly but instead import it into a syncobj. */ new_impl.type = ANV_FENCE_TYPE_SYNCOBJ; - new_impl.syncobj = anv_gem_syncobj_create(device, 0); + /* "If handleType is VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT, the + * special value -1 for fd is treated like a valid sync file descriptor + * referring to an object that has already signaled. The import + * operation will succeed and the VkFence will have a temporarily + * imported payload as if a valid file descriptor had been provided." + */ + uint32_t create_flags = 0; + if (fd == -1) + create_flags |= DRM_SYNCOBJ_CREATE_SIGNALED; + + new_impl.syncobj = anv_gem_syncobj_create(device, create_flags); if (!new_impl.syncobj) return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY); - if (anv_gem_syncobj_import_sync_file(device, new_impl.syncobj, fd)) { + if (fd != -1 && + anv_gem_syncobj_import_sync_file(device, new_impl.syncobj, fd)) { anv_gem_syncobj_destroy(device, new_impl.syncobj); return vk_errorf(device, NULL, VK_ERROR_INVALID_EXTERNAL_HANDLE, "syncobj sync file import failed: %m"); } break; + } default: return vk_error(VK_ERROR_INVALID_EXTERNAL_HANDLE); -- 2.30.2