ac: rename has_syncobj_wait -> has_syncobj_wait_for_submit

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>

diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c
index c042bb229ce43343800f21010cad867f4ec53355..2599fb61643a265b022450a748f29cd077588816 100644 (file)
--- a/src/amd/common/ac_gpu_info.c
+++ b/src/amd/common/ac_gpu_info.c
@@ -277,7 +277,7 @@ bool ac_query_gpu_info(int fd, amdgpu_device_handle dev,
                vce.available_rings ? vce_version : 0;
        info->has_userptr = true;
        info->has_syncobj = has_syncobj(fd);
-       info->has_syncobj_wait = info->has_syncobj && info->drm_minor >= 20;
+       info->has_syncobj_wait_for_submit = info->has_syncobj && info->drm_minor >= 20;
        info->has_sync_file = info->has_syncobj && info->drm_minor >= 21;
        info->has_ctx_priority = info->drm_minor >= 22;
        info->num_render_backends = amdinfo->rb_pipes;

diff --git a/src/amd/common/ac_gpu_info.h b/src/amd/common/ac_gpu_info.h
index 04e17f91c597c871546fbefab2f5390e6e2f2aa9..235cc245bd99fec76c7ea373a8d9222849d076d3 100644 (file)
--- a/src/amd/common/ac_gpu_info.h
+++ b/src/amd/common/ac_gpu_info.h
@@ -81,7 +81,7 @@ struct radeon_info {
        uint32_t                    drm_patchlevel;
        bool                        has_userptr;
        bool                        has_syncobj;
-       bool                        has_syncobj_wait;
+       bool                        has_syncobj_wait_for_submit;
        bool                        has_sync_file;
        bool                        has_ctx_priority;
 

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index ed46692cefb4b9b855e3b569a32c00be150eb745..cbf8f5cf49c08da2f00d273c335af04cb993f40a 100644 (file)
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -3818,8 +3818,8 @@ void radv_GetPhysicalDeviceExternalSemaphorePropertiesKHR(
 {
        RADV_FROM_HANDLE(radv_physical_device, pdevice, physicalDevice);
 
-       /* Require has_syncobj_wait for the syncobj signal ioctl introduced at virtually the same time */
-       if (pdevice->rad_info.has_syncobj_wait &&
+       /* Require has_syncobj_wait_for_submit for the syncobj signal ioctl introduced at virtually the same time */
+       if (pdevice->rad_info.has_syncobj_wait_for_submit &&
            (pExternalSemaphoreInfo->handleType == VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT_KHR || 
             pExternalSemaphoreInfo->handleType == VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT_KHR)) {
                pExternalSemaphoreProperties->exportFromImportedHandleTypes = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT_KHR | VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT_KHR;
@@ -3899,7 +3899,7 @@ void radv_GetPhysicalDeviceExternalFencePropertiesKHR(
 {
        RADV_FROM_HANDLE(radv_physical_device, pdevice, physicalDevice);
 
-       if (pdevice->rad_info.has_syncobj_wait &&
+       if (pdevice->rad_info.has_syncobj_wait_for_submit &&
            (pExternalFenceInfo->handleType == VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_FD_BIT_KHR || 
             pExternalFenceInfo->handleType == VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT_KHR)) {
                pExternalFenceProperties->exportFromImportedHandleTypes = VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_FD_BIT_KHR | VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT_KHR;

diff --git a/src/amd/vulkan/radv_extensions.py b/src/amd/vulkan/radv_extensions.py
index 9af941fab35650a4c677977d446fb30b75b12cc0..6bdb011d6cf45b9cf5c34e984ae36407eb853bc8 100644 (file)
--- a/src/amd/vulkan/radv_extensions.py
+++ b/src/amd/vulkan/radv_extensions.py
@@ -53,9 +53,9 @@ 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',                    1, 'device->rad_info.has_syncobj_wait'),
+    Extension('VK_KHR_external_fence',                    1, 'device->rad_info.has_syncobj_wait_for_submit'),
     Extension('VK_KHR_external_fence_capabilities',       1, True),
-    Extension('VK_KHR_external_fence_fd',                 1, 'device->rad_info.has_syncobj_wait'),
+    Extension('VK_KHR_external_fence_fd',                 1, 'device->rad_info.has_syncobj_wait_for_submit'),
     Extension('VK_KHR_external_memory',                   1, True),
     Extension('VK_KHR_external_memory_capabilities',      1, True),
     Extension('VK_KHR_external_memory_fd',                1, True),