commit 8f4c938c1e9a513bcfd67d6b6e896327db1e12f3
author Yiwei Zhang <zzyiwei@chromium.org> Fri Jun 27 00:30:52 2025 -0700
committer Marge Bot <marge-bot@fdo.invalid> Wed Jul 09 03:47:06 2025 +0000
tree 30eb21157940fc31ce1afe3a0682b4d4a73cada2
parent fb778812624301f78dcc3d2e0e0397397b2982d3

anv: fix ANB gralloc usage query to not append display usage bits

The consumer of the Android surface may or may not be display. e.g. it
can also be a media encoder. When BufferQueue makes the allocation, it
takes the gralloc usage bits from both the client API (EGL/Vulkan) and
the consumer side.

Cc: mesa-stable
Acked-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35785>

src/intel/vulkan/anv_android.c

diff --git a/src/intel/vulkan/anv_android.c b/src/intel/vulkan/anv_android.c
index a2f837b..ff5853f 100644
--- a/src/intel/vulkan/anv_android.c
+++ b/src/intel/vulkan/anv_android.c
@@ -514,26 +514,6 @@
                        "swapchain", imageUsage);
    }
 
-   /* The below formats support GRALLOC_USAGE_HW_FB (that is, display
-    * scanout). This short list of formats is univserally supported on Intel
-    * but is incomplete.  The full set of supported formats is dependent on
-    * kernel and hardware.
-    *
-    * FINISHME: Advertise all display-supported formats.
-    */
-   switch (format) {
-      case VK_FORMAT_B8G8R8A8_UNORM:
-      case VK_FORMAT_R5G6B5_UNORM_PACK16:
-      case VK_FORMAT_R8G8B8A8_UNORM:
-      case VK_FORMAT_R8G8B8A8_SRGB:
-         *grallocUsage |= GRALLOC_USAGE_HW_FB |
-                          GRALLOC_USAGE_HW_COMPOSER |
-                          GRALLOC_USAGE_EXTERNAL_DISP;
-         break;
-      default:
-         mesa_logw("%s: unsupported format=%d", __func__, format);
-   }
-
    if (*grallocUsage == 0)
       return VK_ERROR_FORMAT_NOT_SUPPORTED;