Module: Mesa Branch: main Commit: 8ec81a4b1142bc4a144f80dcd49485fb37d4d8a1 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8ec81a4b1142bc4a144f80dcd49485fb37d4d8a1
Author: Chia-I Wu <[email protected]> Date: Fri Jul 15 11:31:16 2022 -0700 turnip: fix an assertion with drm-shim Fixes deqp-vk: ../src/vulkan/runtime/vk_device.c:49: get_timeline_mode: Assertion `timeline_type == NULL' failed. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17571> --- src/freedreno/vulkan/tu_drm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/freedreno/vulkan/tu_drm.c b/src/freedreno/vulkan/tu_drm.c index e1f55b99112..5fad4ba689c 100644 --- a/src/freedreno/vulkan/tu_drm.c +++ b/src/freedreno/vulkan/tu_drm.c @@ -754,7 +754,9 @@ tu_drm_device_init(struct tu_physical_device *device, } device->syncobj_type = vk_drm_syncobj_get_type(fd); - device->timeline_type = vk_sync_timeline_get_type(&tu_timeline_sync_type); + /* we don't support DRM_CAP_SYNCOBJ_TIMELINE, but drm-shim does */ + if (!(device->syncobj_type.features & VK_SYNC_FEATURE_TIMELINE)) + device->timeline_type = vk_sync_timeline_get_type(&tu_timeline_sync_type); device->sync_types[0] = &device->syncobj_type; device->sync_types[1] = &device->timeline_type.sync;
