intel/genxml: Run sort_xml.sh to tidy gen9.xml and gen11.xml

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>

diff --git a/src/intel/genxml/gen11.xml b/src/intel/genxml/gen11.xml
index 7b8f43d4cc63892e8da05f2f62fa4d738a956ee4..2b34acce8fe4d51e94ff76d08f2199ebcd86651d 100644 (file)
--- a/src/intel/genxml/gen11.xml
+++ b/src/intel/genxml/gen11.xml
@@ -1131,6 +1131,14 @@
     <field name="Component Override W" start="15" end="15" type="bool"/>
   </struct>
 
     <field name="Component Override W" start="15" end="15" type="bool"/>
   </struct>
 

+  <struct name="SLICE_HASH_TABLE" length="32">
+    <group count="16" start="0" size="64">
+      <group count="16" start="0" size="4">
+        <field name="Entry" start="0" end="3" type="uint"/>
+      </group>
+    </group>
+  </struct>
+

   <struct name="SO_DECL" length="1">
     <field name="Component Mask" start="0" end="3" type="uint" default="0"/>
     <field name="Register Index" start="4" end="9" type="uint"/>
   <struct name="SO_DECL" length="1">
     <field name="Component Mask" start="0" end="3" type="uint" default="0"/>
     <field name="Register Index" start="4" end="9" type="uint"/>


@@ -1250,21 +1258,19 @@
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="1"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="3D Command Opcode" start="24" end="26" type="uint" default="1"/>
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>

-    <!-- "On 3DSTATE_3D_MODE, driver must always program bits 31:16 of DW1
-    a value of 0xFFFF" -->
-    <field name="Mask" start="48" end="63" type="mbo"/>
-    <field name="Slice Hashing Table Enable" start="38" end="38" type="bool"/>
-    <field name="Subslice Hashing Mode" start="34" end="35" type="uint">
-       <value name="hashing 8x8"   value="0"/>
-       <value name="hashing 16x4"  value="1"/>
-       <value name="hashing 8x4"   value="2"/>
-       <value name="hashing 16x16" value="3"/>
-    </field>

     <field name="Cross Slice Hashing Mode" start="32" end="33" type="uint">
     <field name="Cross Slice Hashing Mode" start="32" end="33" type="uint">

-       <value name="Normal Mode"    value="0"/>
-       <value name="Disable"        value="1"/>
-       <value name="hashing 32x32"  value="3"/>
+      <value name="Normal Mode" value="0"/>
+      <value name="Disable" value="1"/>
+      <value name="hashing 32x32" value="3"/>

     </field>
     </field>

+    <field name="Subslice Hashing Mode" start="34" end="35" type="uint">
+      <value name="hashing 8x8" value="0"/>
+      <value name="hashing 16x4" value="1"/>
+      <value name="hashing 8x4" value="2"/>
+      <value name="hashing 16x16" value="3"/>
+    </field>
+    <field name="Slice Hashing Table Enable" start="38" end="38" type="bool"/>
+    <field name="Mask" start="48" end="63" type="mbo"/>

   </instruction>
 
   <instruction name="3DSTATE_AA_LINE_PARAMETERS" bias="2" length="3" engine="render">
   </instruction>
 
   <instruction name="3DSTATE_AA_LINE_PARAMETERS" bias="2" length="3" engine="render">


@@ -2499,14 +2505,6 @@
     <field name="Slice Hash Table State Pointer" start="38" end="63" type="offset"/>
   </instruction>
 
     <field name="Slice Hash Table State Pointer" start="38" end="63" type="offset"/>
   </instruction>
 

-  <struct name="SLICE_HASH_TABLE" length="32">
-     <group count="16" start="0" size="64">
-        <group count="16" start="0" size="4">
-           <field name="Entry" start="0" end="3" type="uint"/>
-        </group>
-     </group>
-  </struct>
-

   <instruction name="3DSTATE_SO_BUFFER" bias="2" length="8" engine="render">
     <field name="DWord Length" start="0" end="7" type="uint" default="6"/>
     <field name="3D Command Sub Opcode" start="16" end="23" type="uint" default="24"/>
   <instruction name="3DSTATE_SO_BUFFER" bias="2" length="8" engine="render">
     <field name="DWord Length" start="0" end="7" type="uint" default="6"/>
     <field name="3D Command Sub Opcode" start="16" end="23" type="uint" default="24"/>

diff --git a/src/intel/genxml/gen9.xml b/src/intel/genxml/gen9.xml
index 0d037489df9e469e5c91c50c2167016ff2af5952..c54d6a74aab337366310ef6367ba87bcf7faf00d 100644 (file)
--- a/src/intel/genxml/gen9.xml
+++ b/src/intel/genxml/gen9.xml
@@ -6477,23 +6477,6 @@
     <field name="Color Compression Disable Mask" start="31" end="31" type="bool"/>
   </register>
 
     <field name="Color Compression Disable Mask" start="31" end="31" type="bool"/>
   </register>
 

-  <register name="GT_MODE" length="1" num="0x7008">
-    <field name="Subslice Hashing" start="8" end="9" type="uint">
-      <value name="8x8" value="0"/>
-      <value name="16x4" value="1"/>
-      <value name="8x4" value="2"/>
-      <value name="16x16" value="3"/>
-    </field>
-    <field name="Subslice Hashing Mask" start="24" end="25" type="int"/>
-    <field name="Slice Hashing" start="11" end="12" type="uint">
-      <value name="NORMAL" value="0"/>
-      <value name="DISABLED" value="1"/>
-      <value name="32x16" value="2"/>
-      <value name="32x32" value="3"/>
-    </field>
-    <field name="Slice Hashing Mask" start="27" end="28" type="int"/>
-  </register>
-

   <register name="CL_INVOCATION_COUNT" length="2" num="0x2338">
     <field name="CL Invocation Count Report" start="0" end="63" type="uint"/>
   </register>
   <register name="CL_INVOCATION_COUNT" length="2" num="0x2338">
     <field name="CL Invocation Count Report" start="0" end="63" type="uint"/>
   </register>


@@ -6576,6 +6559,23 @@
     <field name="GS Primitives Count Report" start="0" end="63" type="uint"/>
   </register>
 
     <field name="GS Primitives Count Report" start="0" end="63" type="uint"/>
   </register>
 

+  <register name="GT_MODE" length="1" num="0x7008">
+    <field name="Subslice Hashing" start="8" end="9" type="uint">
+      <value name="8x8" value="0"/>
+      <value name="16x4" value="1"/>
+      <value name="8x4" value="2"/>
+      <value name="16x16" value="3"/>
+    </field>
+    <field name="Slice Hashing" start="11" end="12" type="uint">
+      <value name="NORMAL" value="0"/>
+      <value name="DISABLED" value="1"/>
+      <value name="32x16" value="2"/>
+      <value name="32x32" value="3"/>
+    </field>
+    <field name="Subslice Hashing Mask" start="24" end="25" type="int"/>
+    <field name="Slice Hashing Mask" start="27" end="28" type="int"/>
+  </register>
+

   <register name="HS_INVOCATION_COUNT" length="2" num="0x2300">
     <field name="HS Invocation Count Report" start="0" end="63" type="uint"/>
   </register>
   <register name="HS_INVOCATION_COUNT" length="2" num="0x2300">
     <field name="HS Invocation Count Report" start="0" end="63" type="uint"/>
   </register>