Mesa (staging/21.3): panfrost: Fix Secondary Shader field

[GitLab Mirror]

Module: Mesa
Branch: staging/21.3
Commit: e2db0daf63163cd64316f90e35f7836993591873
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e2db0daf63163cd64316f90e35f7836993591873

Author: Alyssa Rosenzweig <alyssa at collabora.com>
Date:   Sat Oct 23 15:25:02 2021 -0400

panfrost: Fix Secondary Shader field

Off-by-one on the start.

Signed-off-by: Alyssa Rosenzweig <alyssa at collabora.com>
Reported-by: Icecream95 <ixn at disroot.org>
Fixes: 73e80994d50 ("panfrost: Add secondary shader XML fields")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14154>
(cherry picked from commit 8dc1936faac8804669e21901bacf170e1c009291)

---

 .pick_status.json              | 2 +-
 src/panfrost/lib/genxml/v6.xml | 2 +-
 src/panfrost/lib/genxml/v7.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index da105d0d0df..88b9961a87a 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -760,7 +760,7 @@
         "description": "panfrost: Fix Secondary Shader field",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "73e80994d501c2a422a969cdb2fbb321969099b2"
     },
diff --git a/src/panfrost/lib/genxml/v6.xml b/src/panfrost/lib/genxml/v6.xml
index 64bf6998d9d..ba7bfd72cfd 100644
--- a/src/panfrost/lib/genxml/v6.xml
+++ b/src/panfrost/lib/genxml/v6.xml
@@ -835,7 +835,7 @@
     <field name="Alpha reference" size="32" start="12:0" type="float"/>
     <field name="Thread Balancing" size="16" start="13:0" type="uint"/>
     <field name="Secondary preload" size="32" start="13:0" type="Preload"/>
-    <field name="Secondary shader" size="64" start="13:0" type="address"/>
+    <field name="Secondary shader" size="64" start="14:0" type="address"/>
   </struct>
 
   <struct name="Uniform Buffer" align="8">
diff --git a/src/panfrost/lib/genxml/v7.xml b/src/panfrost/lib/genxml/v7.xml
index 770df9af7e1..31b217f8622 100644
--- a/src/panfrost/lib/genxml/v7.xml
+++ b/src/panfrost/lib/genxml/v7.xml
@@ -881,7 +881,7 @@
     <field name="Alpha reference" size="32" start="12:0" type="float"/>
     <field name="Thread Balancing" size="16" start="13:0" type="uint"/>
     <field name="Secondary preload" size="32" start="13:0" type="Preload"/>
-    <field name="Secondary shader" size="64" start="13:0" type="address"/>
+    <field name="Secondary shader" size="64" start="14:0" type="address"/>
     <field name="Message Preload 1" size="16" start="15:0" type="uint"/>
     <field name="Message Preload 2" size="16" start="15:16" type="uint"/>
   </struct>