From 329a02289436e8e095dce832ddc9709d33650d08 Mon Sep 17 00:00:00 2001
From: Rob Clark <rob.clark@oss.qualcomm.com>
Date: Fri, 11 Jul 2025 07:31:40 -0700
Subject: [PATCH] freedreno/a6xx: Use metadata to resolve INVALID modifier

Signed-off-by: Rob Clark <rob.clark@oss.qualcomm.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36075>
---
 src/gallium/drivers/freedreno/a6xx/fd6_resource.cc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_resource.cc b/src/gallium/drivers/freedreno/a6xx/fd6_resource.cc
index ddd0fd492ad..815008dbaed 100644
--- a/src/gallium/drivers/freedreno/a6xx/fd6_resource.cc
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_resource.cc
@@ -307,6 +307,12 @@ fd6_layout_resource_for_handle(struct fd_resource *rsc, struct winsys_handle *ha
 {
    uint64_t modifier = handle->modifier;
 
+   if (modifier == DRM_FORMAT_MOD_INVALID) {
+      struct fdl_metadata metadata;
+      if (!fd_bo_get_metadata(rsc->bo, &metadata, sizeof(metadata)))
+         modifier = metadata.modifier;
+   }
+
    switch (modifier) {
    case DRM_FORMAT_MOD_QCOM_COMPRESSED:
       return layout_resource_for_handle(rsc, handle, true, TILE6_3);