diff --git a/.pick_status.json b/.pick_status.json index c3adeb11f18..8a7a27fbf7e 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -256,7 +256,7 @@ "description": "v3dv: Enable sync_fd importing/exporting on Android", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "316728a55bc8fe398be1ac2796a22f8c91fb886c" }, diff --git a/src/broadcom/vulkan/v3dv_device.c b/src/broadcom/vulkan/v3dv_device.c index 6681ba32b4e..50ac6fd470a 100644 --- a/src/broadcom/vulkan/v3dv_device.c +++ b/src/broadcom/vulkan/v3dv_device.c @@ -863,6 +863,7 @@ physical_device_init(struct v3dv_physical_device *device, */ device->drm_syncobj_type.features &= ~VK_SYNC_FEATURE_TIMELINE; +#ifndef ANDROID /* Sync file export is incompatible with the current model of execution * where some jobs may run on the CPU. There are CTS tests which do the * following: @@ -888,6 +889,7 @@ physical_device_init(struct v3dv_physical_device *device, */ device->drm_syncobj_type.import_sync_file = NULL; device->drm_syncobj_type.export_sync_file = NULL; +#endif /* Multiwait is required for emulated timeline semaphores and is supported * by the v3d kernel interface.