From ef6725a5f44e14d1685213c4afdb7dc97a207734 Mon Sep 17 00:00:00 2001 From: Mauro Rossi Date: Thu, 8 Dec 2022 16:29:04 +0100 Subject: [PATCH] hasvk/android: remove numFds check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change required for compatibility with minigbm gralloc4 due to gralloc handle having DRV_MAX_FDS = (DRV_MAX_PLANES + 1) https://android.googlesource.com/platform/external/minigbm/+/refs/tags/android-13.0.0_r18/cros_gralloc/cros_gralloc_handle.h#14 Cc: "22.3" mesa-stable Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/7807 Reviewed-by: Roman Stratiienko Reviewed-by: Tapani Pälli Part-of: --- src/intel/vulkan_hasvk/anv_android.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/intel/vulkan_hasvk/anv_android.c b/src/intel/vulkan_hasvk/anv_android.c index 53b63a0c7ef..06277136dea 100644 --- a/src/intel/vulkan_hasvk/anv_android.c +++ b/src/intel/vulkan_hasvk/anv_android.c @@ -392,12 +392,6 @@ anv_image_init_from_gralloc(struct anv_device *device, .isl_extra_usage_flags = ISL_SURF_USAGE_DISABLE_AUX_BIT, }; - if (gralloc_info->handle->numFds != 1) { - return vk_errorf(device, VK_ERROR_INVALID_EXTERNAL_HANDLE, - "VkNativeBufferANDROID::handle::numFds is %d, " - "expected 1", gralloc_info->handle->numFds); - } - /* Do not close the gralloc handle's dma_buf. The lifetime of the dma_buf * must exceed that of the gralloc handle, and we do not own the gralloc * handle.