commit 9a9b35a3bb40d736f3a89d27da10f8a7354bc1ed
author Roman Stratiienko <r.stratiienko@gmail.com> Sun Jul 26 06:37:57 2020 +0300
committer Marge Bot <eric+marge@anholt.net> Tue Aug 04 13:58:33 2020 +0000
tree c453bffb377ff68f261ac9fded74b475550e8e54
parent ee2c58dde46a7c673cd19cdd433af5c13b5e2ae1

lima: Fix lima_screen_query_dmabuf_modifiers()

Incorrect implementation has been found during code surfing.
v3d implementation used for reference.

Signed-off-by: Roman Stratiienko <r.stratiienko@gmail.com>
Reviewed-by: Icenowy Zheng <icenowy@aosc.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6076>

src/gallium/drivers/lima/lima_screen.c

diff --git a/src/gallium/drivers/lima/lima_screen.c b/src/gallium/drivers/lima/lima_screen.c
index 1a6ff22..9118212 100644
--- a/src/gallium/drivers/lima/lima_screen.c
+++ b/src/gallium/drivers/lima/lima_screen.c
@@ -440,15 +440,18 @@
       DRM_FORMAT_MOD_LINEAR,
    };
 
+   int num_modifiers = ARRAY_SIZE(available_modifiers);
+
    if (!modifiers) {
-      *count = ARRAY_SIZE(available_modifiers);
+      *count = num_modifiers;
       return;
    }
 
+   *count = MIN2(max, num_modifiers);
    for (int i = 0; i < *count; i++) {
       modifiers[i] = available_modifiers[i];
       if (external_only)
-         external_only = false;
+         external_only[i] = false;
    }
 }