From 0e65c6de0e7e763afa6be38da6285bcd54dfcbb2 Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa@collabora.com>
Date: Tue, 3 May 2022 16:08:18 -0400
Subject: [PATCH] panfrost: Correct XML for TLS

It was never updated for Valhall, from Midgard.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16314>
---
 src/panfrost/lib/genxml/v9.xml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/panfrost/lib/genxml/v9.xml b/src/panfrost/lib/genxml/v9.xml
index 797f958f444..a37e2d6ef3d 100644
--- a/src/panfrost/lib/genxml/v9.xml
+++ b/src/panfrost/lib/genxml/v9.xml
@@ -94,6 +94,11 @@
     <value name="Always" value="7"/>
   </enum>
 
+  <enum name="Address Mode">
+    <value name="Flat" value="0"/>
+    <value name="Packed" value="1"/>
+  </enum>
+
   <enum name="Format">
     <!--
       Used to index into the TEXTURE_FEATURES register, which indicates support
@@ -875,14 +880,13 @@
 
   <struct name="Local Storage" size="8" align="64">
     <field name="TLS Size" size="5" start="0:0" type="uint"/>
-    <field name="TLS Initial Stack Pointer Offset" size="27" start="0:5" type="uint"/>
     <field name="WLS Instances" size="5" start="1:0" type="uint" modifier="log2" prefix="MALI_LOCAL_STORAGE" default="MALI_LOCAL_STORAGE_NO_WORKGROUP_MEM">
       <value name="No Workgroup Mem" value="0x80000000"/>
     </field>
     <field name="WLS Size Base" size="2" start="1:5" type="uint"/>
     <field name="WLS Size Scale" size="5" start="1:8" type="uint"/>
-    <!-- Encoded as (0x10000000 << 32) | (real_base >> 8) due to TLS hashing -->
-    <field name="TLS Base Pointer" size="64" start="2:0" type="address"/>
+    <field name="TLS Base Pointer" size="48" start="2:0" type="address"/>
+    <field name="TLS Address Mode" size="4" start="3:28" type="Address Mode"/>
     <field name="WLS Base Pointer" size="64" start="4:0" type="address"/>
   </struct>