turnip: Drop the assertion about the temporary bit in sync fd imports.
authorEmma Anholt <emma@anholt.net>
Thu, 21 Oct 2021 20:06:38 +0000 (13:06 -0700)
committerMarge Bot <eric+marge@anholt.net>
Fri, 22 Oct 2021 21:44:44 +0000 (21:44 +0000)
Khronos's conclusion was that you only need the bit when you want
temporary and there's a choice between temporary and permanent.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13473>

src/freedreno/ci/deqp-freedreno-a630-skips.txt
src/freedreno/vulkan/tu_drm.c

index f9cab0a..542314d 100644 (file)
@@ -5,9 +5,6 @@
 # Note normal pre-merge CI also includes -premerge-skips.txt, and that's where
 # "it's slow but would pass/fail/crash within a couple of minutes" skips should go.
 
-# Crashes likely caused by https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/2701
-dEQP-VK.synchronization.cross_instance.*binary_semaphore_fence_fd
-
 # Timeouts in CI even after 5 minutes
 dEQP-VK.tessellation.invariance.outer_edge_division.quads_equal_spacing
 dEQP-VK.tessellation.invariance.outer_edge_division.quads_fractional_even_spacing
index a3a1b88..ae8c037 100644 (file)
@@ -658,7 +658,16 @@ sync_import(VkDevice _device, struct tu_syncobj *sync, bool temporary, bool sync
       *dst = handle.handle;
       close(fd);
    } else {
-      assert(temporary);
+      /* Note: SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT is always temporary, but the
+       * user doesn't have to specify the temporary bit because that's only
+       * needed for choosing a permanence when there's an option.
+       *
+       * "VK_SEMAPHORE_IMPORT_TEMPORARY_BIT specifies that the semaphore payload
+       * will be imported only temporarily, as described in Importing Semaphore
+       * Payloads, regardless of the permanence of handleType"
+       *
+       * https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/2701
+       */
 
       struct drm_syncobj_create create = {};