From e839ff344e5e201f6343adc3a1a0f8af31aec834 Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu.vizoso@ideasonboard.com>
Date: Tue, 12 Nov 2024 16:45:31 +0100
Subject: [PATCH] etnaviv/ml: Fix includes

etnaviv_ml.h uses dynarray, but the u_inlines.h header is needed by
some of the files that include it.

Fixes: d6473ce28ee0 ("etnaviv: Use NN cores to accelerate convolutions")
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de
(cherry picked from commit 70bff0c971aa41d9eacf813a771a73918b0146aa)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32119>
---
 .pick_status.json                        | 2 +-
 src/gallium/drivers/etnaviv/etnaviv_ml.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 158f26aee49..63aa378ff85 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -514,7 +514,7 @@
         "description": "etnaviv/ml: Fix includes",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "d6473ce28ee0f36890e24b3832cd53d3ed5e98e7",
         "notes": null
diff --git a/src/gallium/drivers/etnaviv/etnaviv_ml.h b/src/gallium/drivers/etnaviv/etnaviv_ml.h
index 4b77dc99253..1335e36eb22 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_ml.h
+++ b/src/gallium/drivers/etnaviv/etnaviv_ml.h
@@ -7,7 +7,7 @@
 #define H_ETNA_ML
 
 #include "pipe/p_state.h"
-#include "util/u_inlines.h"
+#include "util/u_dynarray.h"
 
 #define MAX_CONFIG_BOS 4