From 4d4872708ef8dc4915f61274c1c795b8e8472357 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Thu, 13 Jul 2017 12:42:49 -0700
Subject: [PATCH] broadcom/vc4: Switch the V3D 2.1 XML over to restricted
 address fields.

This keeps the flags out of v3d_decode.c's output.  In the generated code,
only the unpack functions see any change (where they now get the
restricted start value), and vc4 doesn't use the unpack functions yet.
---
 src/broadcom/cle/v3d_packet_v21.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/broadcom/cle/v3d_packet_v21.xml b/src/broadcom/cle/v3d_packet_v21.xml
index b28f2b5eb6c..3721815c2e0 100644
--- a/src/broadcom/cle/v3d_packet_v21.xml
+++ b/src/broadcom/cle/v3d_packet_v21.xml
@@ -18,7 +18,7 @@
   <packet name="Store Multi-sample Resolved Tile Color Buffer and EOF" code="25" cl="R"/>
 
   <packet name="Store Full Resolution Tile Buffer" cl="R" code="26">
-    <field name="Address" size="32" start="0" type="address"/>
+    <field name="Address" size="28" start="4" type="address"/>
     <field name="Last Tile" size="1" start="3" type="bool"/>
     <field name="Disable Clear on Write" size="1" start="2" type="bool"/>
     <field name="Disable Z/Stencil Buffer write" size="1" start="1" type="bool"/>
@@ -26,13 +26,13 @@
   </packet>
 
   <packet name="Re-load Full Resolution Tile Buffer" cl="R" code="27">
-    <field name="Address" size="32" start="0" type="address"/>
+    <field name="Address" size="28" start="4" type="address"/>
     <field name="Disable Z/Stencil Buffer read" size="1" start="1" type="bool"/>
     <field name="Disable Color Buffer read" size="1" start="0" type="bool"/>
   </packet>
 
   <packet name="Store Tile Buffer General" code="28" cl="R">
-    <field name="Memory base address of frame/tile dump buffer" size="32" start="16" type="address"/>
+    <field name="Memory base address of frame/tile dump buffer" size="28" start="20" type="address"/>
     <field name="Last Tile of Frame" size="1" start="19" type="bool"/>
     <field name="Disable VG-Mask buffer dump" size="1" start="18" type="bool"/>
     <field name="Disable Z/Stencil buffer dump" size="1" start="17" type="bool"/>
@@ -69,7 +69,7 @@
   </packet>
 
   <packet name="Load Tile Buffer General" code="29" cl="R">
-    <field name="Memory base address of frame/tile dump buffer" size="32" start="16" type="address"/>
+    <field name="Memory base address of frame/tile dump buffer" size="28" start="20" type="address"/>
     <field name="Disable VG-Mask buffer load" size="1" start="18" type="bool"/>
     <field name="Disable Z/Stencil buffer load" size="1" start="17" type="bool"/>
     <field name="Disable Color buffer load" size="1" start="16" type="bool"/>
-- 
2.30.2