From b341b39db3b8e25d396b1eddbc81517d5ae4bad7 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Wed, 27 Jun 2018 16:31:19 -0700
Subject: [PATCH] v3d: Fix the shader code address field widths on V3D 4.1+

We were overlapping it with the threadable/nan flags, resulting in
incorrect relocations (threadable/nan included in the offset) and wrong
ordering in the CLIF files.
---
 src/broadcom/cle/v3d_packet_v33.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/broadcom/cle/v3d_packet_v33.xml b/src/broadcom/cle/v3d_packet_v33.xml
index 95e47b5c14d..3eb8d8b7287 100644
--- a/src/broadcom/cle/v3d_packet_v33.xml
+++ b/src/broadcom/cle/v3d_packet_v33.xml
@@ -1090,19 +1090,19 @@
 
     <field name="Address of default attribute values" size="32" start="8b" type="address"/>
 
-    <field name="Fragment Shader Code Address" size="32" start="12b" type="address"/>
+    <field name="Fragment Shader Code Address" size="29" start="99" type="address"/>
     <field name="Fragment Shader 4-way threadable" size="1" start="96" type="bool"/>
     <field name="Fragment Shader start in final thread section" size="1" start="97" type="bool"/>
     <field name="Fragment Shader Propagate NaNs" size="1" start="98" type="bool"/>
     <field name="Fragment Shader Uniforms Address" size="32" start="16b" type="address"/>
 
-    <field name="Vertex Shader Code Address" size="32" start="20b" type="address"/>
+    <field name="Vertex Shader Code Address" size="29" start="163" type="address"/>
     <field name="Vertex Shader 4-way threadable" size="1" start="160" type="bool"/>
     <field name="Vertex Shader start in final thread section" size="1" start="161" type="bool"/>
     <field name="Vertex Shader Propagate NaNs" size="1" start="162" type="bool"/>
     <field name="Vertex Shader Uniforms Address" size="32" start="24b" type="address"/>
 
-    <field name="Coordinate Shader Code Address" size="32" start="28b" type="address"/>
+    <field name="Coordinate Shader Code Address" size="29" start="227" type="address"/>
     <field name="Coordinate Shader 4-way threadable" size="1" start="224" type="bool"/>
     <field name="Coordinate Shader start in final thread section" size="1" start="225" type="bool"/>
     <field name="Coordinate Shader Propagate NaNs" size="1" start="226" type="bool"/>
-- 
2.30.2