From 6da1c1d0257bce7f0c78afb05307a0aa92bdd601 Mon Sep 17 00:00:00 2001
From: Ludvig Lindau <ludvig.lindau@arm.com>
Date: Tue, 26 Aug 2025 11:29:56 +0000
Subject: [PATCH] pan/genxml: Add ConversionDesc to v9+ BufferDescriptor

Add a field in BufferDescriptor to hold a ConversionDescriptor to
prepare for changing texel buffers to use BufferDescriptor instead of
TextureDescriptor

Also re-orders the descriptor based on word offset where appropriate.

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37007>
---
 src/panfrost/genxml/v10.xml | 2 ++
 src/panfrost/genxml/v12.xml | 8 +++++---
 src/panfrost/genxml/v13.xml | 8 +++++---
 src/panfrost/genxml/v9.xml  | 2 ++
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/panfrost/genxml/v10.xml b/src/panfrost/genxml/v10.xml
index 31cf040504b..f603c09fdd6 100644
--- a/src/panfrost/genxml/v10.xml
+++ b/src/panfrost/genxml/v10.xml
@@ -1054,6 +1054,8 @@
     <field name="Packet stride" size="16" start="4:0" type="uint" modifier="shr(6)"/>
     <field name="Attribute stride" size="16" start="4:16" type="uint"/>
 
+    <!-- Texel buffer only, this is not interpreted by HW -->
+    <field name="Conversion" size="32" start="7:0" type="Internal Conversion"/>
   </struct>
 
   <enum name="Point Size Array Format">
diff --git a/src/panfrost/genxml/v12.xml b/src/panfrost/genxml/v12.xml
index a6b06c3fb6a..d3ae38dc9ff 100644
--- a/src/panfrost/genxml/v12.xml
+++ b/src/panfrost/genxml/v12.xml
@@ -1282,9 +1282,6 @@
     <field name="Size" size="32" start="1:0" type="uint"/>
     <field name="Address" size="64" start="2:0" type="address"/>
 
-    <!-- Not for Tiler heap -->
-    <field name="Size hi" size="32" start="5:0" type="uint"/>
-
     <!-- Structured buffer only -->
     <field name="Stride" size="32" start="4:0" type="uint"/>
 
@@ -1292,6 +1289,11 @@
     <field name="Packet stride" size="16" start="4:0" type="uint" modifier="shr(6)"/>
     <field name="Attribute stride" size="16" start="4:16" type="uint"/>
 
+    <!-- Not for Tiler heap -->
+    <field name="Size hi" size="32" start="5:0" type="uint"/>
+
+    <!-- Texel buffer only, this is not interpreted by HW -->
+    <field name="Conversion" size="32" start="7:0" type="Internal Conversion"/>
   </struct>
 
   <enum name="Point Size Array Format">
diff --git a/src/panfrost/genxml/v13.xml b/src/panfrost/genxml/v13.xml
index 857e9d72505..098dac45cef 100644
--- a/src/panfrost/genxml/v13.xml
+++ b/src/panfrost/genxml/v13.xml
@@ -1591,9 +1591,6 @@
     <field name="Size" size="32" start="1:0" type="uint"/>
     <field name="Address" size="64" start="2:0" type="address"/>
 
-    <!-- Not for Tiler heap -->
-    <field name="Size hi" size="32" start="5:0" type="uint"/>
-
     <!-- Structured buffer only -->
     <field name="Stride" size="32" start="4:0" type="uint"/>
 
@@ -1601,6 +1598,11 @@
     <field name="Packet stride" size="16" start="4:0" type="uint" modifier="shr(6)"/>
     <field name="Attribute stride" size="16" start="4:16" type="uint"/>
 
+    <!-- Not for Tiler heap -->
+    <field name="Size hi" size="32" start="5:0" type="uint"/>
+
+    <!-- Texel buffer only, this is not interpreted by HW -->
+    <field name="Conversion" size="32" start="7:0" type="Internal Conversion"/>
   </struct>
 
   <enum name="FIFO format">
diff --git a/src/panfrost/genxml/v9.xml b/src/panfrost/genxml/v9.xml
index 2c8139c5358..916826dd481 100644
--- a/src/panfrost/genxml/v9.xml
+++ b/src/panfrost/genxml/v9.xml
@@ -600,6 +600,8 @@
     <field name="Packet stride" size="16" start="4:0" type="uint" modifier="shr(6)"/>
     <field name="Attribute stride" size="16" start="4:16" type="uint"/>
 
+    <!-- Texel buffer only, this is not interpreted by HW -->
+    <field name="Conversion" size="32" start="7:0" type="Internal Conversion"/>
   </struct>
 
   <enum name="Point Size Array Format">