Merge Mesa 21.3.7

11 files changed, 121 insertions, 132 deletions

diff --git a/lib/mesa/src/intel/genxml/gen4.xml b/lib/mesa/src/intel/genxml/gen4.xml
index 85269ce13..c0ad311b4 100644
--- a/lib/mesa/src/intel/genxml/gen4.xml
+++ b/lib/mesa/src/intel/genxml/gen4.xml
@@ -330,15 +330,15 @@
   </struct>
 
   <struct name="SAMPLER_STATE" length="4">
-    <field name="Shadow Function" start="0" end="2" type="uint">
-      <value name="PREFILTEROP_ALWAYS" value="0"/>
-      <value name="PREFILTEROP_NEVER" value="1"/>
-      <value name="PREFILTEROP_LESS" value="2"/>
-      <value name="PREFILTEROP_EQUAL" value="3"/>
-      <value name="PREFILTEROP_LEQUAL" value="4"/>
-      <value name="PREFILTEROP_GREATER" value="5"/>
-      <value name="PREFILTEROP_NOTEQUAL" value="6"/>
-      <value name="PREFILTEROP_GEQUAL" value="7"/>
+    <field name="Shadow Function" start="0" end="2" type="uint" prefix="PREFILTEROP">
+      <value name="ALWAYS" value="0"/>
+      <value name="NEVER" value="1"/>
+      <value name="LESS" value="2"/>
+      <value name="EQUAL" value="3"/>
+      <value name="LEQUAL" value="4"/>
+      <value name="GREATER" value="5"/>
+      <value name="NOTEQUAL" value="6"/>
+      <value name="GEQUAL" value="7"/>
     </field>
     <field name="Texture LOD Bias" start="3" end="13" type="s4.6"/>
     <field name="Min Mode Filter" start="14" end="16" type="uint" prefix="MAPFILTER"/>
@@ -875,8 +875,7 @@
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="Physical Start Address Extension" start="32" end="35" type="address"/>
     <field name="Address" start="66" end="95" type="address"/>
-    <field name="Data DWord 0" start="96" end="127" type="uint"/>
-    <field name="Data DWord 1" start="128" end="159" type="uint"/>
+    <field name="Immediate Data" start="96" end="159" type="uint"/>
   </instruction>
 
   <instruction name="MI_STORE_REGISTER_MEM" bias="2" length="3">
@@ -970,14 +969,14 @@
     <field name="CS Fence" start="84" end="94" type="uint"/>
   </instruction>
 
-  <instruction name="XY_COLOR_BLT" bias="2" length="6" engine="blitter">
+  <instruction name="XY_COLOR_BLT" bias="2" length="6" engine="render">
     <field name="DWord Length" start="0" end="7" type="uint" default="4"/>
     <field name="Tiling Enable" start="11" end="11" type="bool"/>
     <field name="32bpp Byte Mask" start="20" end="21" type="uint"/>
     <field name="2D Command Opcode" start="22" end="28" type="uint" default="80"/>
     <field name="Command Type" start="29" end="31" type="uint" default="2"/>
     <field name="Destination Pitch" start="32" end="47" type="int"/>
-    <field name="Raster Operation" start="48" end="55" type="int"/>
+    <field name="Raster Operation" start="48" end="55" type="uint"/>
     <field name="Color Depth" start="56" end="57" type="uint" prefix="COLOR_DEPTH">
       <value name="8 bit" value="0"/>
       <value name="565" value="1"/>
@@ -993,14 +992,14 @@
     <field name="Solid Pattern Color" start="160" end="191" type="int"/>
   </instruction>
 
-  <instruction name="XY_SETUP_BLT" bias="2" length="8" engine="blitter">
+  <instruction name="XY_SETUP_BLT" bias="2" length="8" engine="render">
     <field name="DWord Length" start="0" end="7" type="uint" default="6"/>
     <field name="Tiling Enable" start="11" end="11" type="bool"/>
     <field name="32bpp Byte Mask" start="20" end="21" type="uint"/>
     <field name="2D Command Opcode" start="22" end="28" type="uint" default="1"/>
     <field name="Command Type" start="29" end="31" type="uint" default="2"/>
     <field name="Destination Pitch" start="32" end="47" type="int"/>
-    <field name="Raster Operation" start="48" end="55" type="int"/>
+    <field name="Raster Operation" start="48" end="55" type="uint"/>
     <field name="Color Depth" start="56" end="57" type="uint" prefix="COLOR_DEPTH">
       <value name="8 bit" value="0"/>
       <value name="565" value="1"/>
@@ -1019,7 +1018,7 @@
     <field name="Pattern Base Address" start="224" end="255" type="uint"/>
   </instruction>
 
-  <instruction name="XY_SRC_COPY_BLT" bias="2" length="8" engine="blitter">
+  <instruction name="XY_SRC_COPY_BLT" bias="2" length="8" engine="render">
     <field name="DWord Length" start="0" end="7" type="uint" default="6"/>
     <field name="Destination Tiling Enable" start="11" end="11" type="bool"/>
     <field name="Source Tiling Enable" start="15" end="15" type="bool"/>
@@ -1027,7 +1026,7 @@
     <field name="2D Command Opcode" start="22" end="28" type="uint" default="83"/>
     <field name="Command Type" start="29" end="31" type="uint" default="2"/>
     <field name="Destination Pitch" start="32" end="47" type="int"/>
-    <field name="Raster Operation" start="48" end="55" type="int"/>
+    <field name="Raster Operation" start="48" end="55" type="uint"/>
     <field name="Color Depth" start="56" end="57" type="uint" prefix="COLOR_DEPTH">
       <value name="8 bit" value="0"/>
       <value name="565" value="1"/>
@@ -1046,7 +1045,7 @@
     <field name="Source Base Address" start="224" end="255" type="address"/>
   </instruction>
 
-  <instruction name="XY_TEXT_IMMEDIATE_BLT" bias="2" length="3" engine="blitter">
+  <instruction name="XY_TEXT_IMMEDIATE_BLT" bias="2" length="3" engine="render">
     <field name="DWord Length" start="0" end="7" type="uint" default="1"/>
     <field name="Tiling Enable" start="11" end="11" type="bool"/>
     <field name="Packing" start="16" end="16" type="uint">
diff --git a/lib/mesa/src/intel/genxml/gen45.xml b/lib/mesa/src/intel/genxml/gen45.xml
index e803b004a..218893185 100644
--- a/lib/mesa/src/intel/genxml/gen45.xml
+++ b/lib/mesa/src/intel/genxml/gen45.xml
@@ -337,15 +337,15 @@
   </struct>
 
   <struct name="SAMPLER_STATE" length="4">
-    <field name="Shadow Function" start="0" end="2" type="uint">
-      <value name="PREFILTEROP_ALWAYS" value="0"/>
-      <value name="PREFILTEROP_NEVER" value="1"/>
-      <value name="PREFILTEROP_LESS" value="2"/>
-      <value name="PREFILTEROP_EQUAL" value="3"/>
-      <value name="PREFILTEROP_LEQUAL" value="4"/>
-      <value name="PREFILTEROP_GREATER" value="5"/>
-      <value name="PREFILTEROP_NOTEQUAL" value="6"/>
-      <value name="PREFILTEROP_GEQUAL" value="7"/>
+    <field name="Shadow Function" start="0" end="2" type="uint" prefix="PREFILTEROP">
+      <value name="ALWAYS" value="0"/>
+      <value name="NEVER" value="1"/>
+      <value name="LESS" value="2"/>
+      <value name="EQUAL" value="3"/>
+      <value name="LEQUAL" value="4"/>
+      <value name="GREATER" value="5"/>
+      <value name="NOTEQUAL" value="6"/>
+      <value name="GEQUAL" value="7"/>
     </field>
     <field name="Texture LOD Bias" start="3" end="13" type="s4.6"/>
     <field name="Min Mode Filter" start="14" end="16" type="uint" prefix="MAPFILTER"/>
@@ -905,8 +905,7 @@
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="Physical Start Address Extension" start="32" end="35" type="address"/>
     <field name="Address" start="66" end="95" type="address"/>
-    <field name="Data DWord 0" start="96" end="127" type="uint"/>
-    <field name="Data DWord 1" start="128" end="159" type="uint"/>
+    <field name="Immediate Data" start="96" end="159" type="uint"/>
   </instruction>
 
   <instruction name="MI_STORE_REGISTER_MEM" bias="2" length="3">
@@ -1003,14 +1002,14 @@
     <field name="CS Fence" start="84" end="94" type="uint"/>
   </instruction>
 
-  <instruction name="XY_COLOR_BLT" bias="2" length="6" engine="blitter">
+  <instruction name="XY_COLOR_BLT" bias="2" length="6" engine="render">
     <field name="DWord Length" start="0" end="7" type="uint" default="4"/>
     <field name="Tiling Enable" start="11" end="11" type="bool"/>
     <field name="32bpp Byte Mask" start="20" end="21" type="uint"/>
     <field name="2D Command Opcode" start="22" end="28" type="uint" default="80"/>
     <field name="Command Type" start="29" end="31" type="uint" default="2"/>
     <field name="Destination Pitch" start="32" end="47" type="int"/>
-    <field name="Raster Operation" start="48" end="55" type="int"/>
+    <field name="Raster Operation" start="48" end="55" type="uint"/>
     <field name="Color Depth" start="56" end="57" type="uint" prefix="COLOR_DEPTH">
       <value name="8 bit" value="0"/>
       <value name="565" value="1"/>
@@ -1026,14 +1025,14 @@
     <field name="Solid Pattern Color" start="160" end="191" type="int"/>
   </instruction>
 
-  <instruction name="XY_SETUP_BLT" bias="2" length="8" engine="blitter">
+  <instruction name="XY_SETUP_BLT" bias="2" length="8" engine="render">
     <field name="DWord Length" start="0" end="7" type="uint" default="6"/>
     <field name="Tiling Enable" start="11" end="11" type="bool"/>
     <field name="32bpp Byte Mask" start="20" end="21" type="uint"/>
     <field name="2D Command Opcode" start="22" end="28" type="uint" default="1"/>
     <field name="Command Type" start="29" end="31" type="uint" default="2"/>
     <field name="Destination Pitch" start="32" end="47" type="int"/>
-    <field name="Raster Operation" start="48" end="55" type="int"/>
+    <field name="Raster Operation" start="48" end="55" type="uint"/>
     <field name="Color Depth" start="56" end="57" type="uint" prefix="COLOR_DEPTH">
       <value name="8 bit" value="0"/>
       <value name="565" value="1"/>
@@ -1052,7 +1051,7 @@
     <field name="Pattern Base Address" start="224" end="255" type="uint"/>
   </instruction>
 
-  <instruction name="XY_SRC_COPY_BLT" bias="2" length="8" engine="blitter">
+  <instruction name="XY_SRC_COPY_BLT" bias="2" length="8" engine="render">
     <field name="DWord Length" start="0" end="7" type="uint" default="6"/>
     <field name="Destination Tiling Enable" start="11" end="11" type="bool"/>
     <field name="Source Tiling Enable" start="15" end="15" type="bool"/>
@@ -1060,7 +1059,7 @@
     <field name="2D Command Opcode" start="22" end="28" type="uint" default="83"/>
     <field name="Command Type" start="29" end="31" type="uint" default="2"/>
     <field name="Destination Pitch" start="32" end="47" type="int"/>
-    <field name="Raster Operation" start="48" end="55" type="int"/>
+    <field name="Raster Operation" start="48" end="55" type="uint"/>
     <field name="Color Depth" start="56" end="57" type="uint" prefix="COLOR_DEPTH">
       <value name="8 bit" value="0"/>
       <value name="565" value="1"/>
@@ -1079,7 +1078,7 @@
     <field name="Source Base Address" start="224" end="255" type="address"/>
   </instruction>
 
-  <instruction name="XY_TEXT_IMMEDIATE_BLT" bias="2" length="3" engine="blitter">
+  <instruction name="XY_TEXT_IMMEDIATE_BLT" bias="2" length="3" engine="render">
     <field name="DWord Length" start="0" end="7" type="uint" default="1"/>
     <field name="Tiling Enable" start="11" end="11" type="bool"/>
     <field name="Packing" start="16" end="16" type="uint">
diff --git a/lib/mesa/src/intel/genxml/gen5.xml b/lib/mesa/src/intel/genxml/gen5.xml
index 1a5be6172..5c13c782f 100644
--- a/lib/mesa/src/intel/genxml/gen5.xml
+++ b/lib/mesa/src/intel/genxml/gen5.xml
@@ -368,15 +368,15 @@
   </struct>
 
   <struct name="SAMPLER_STATE" length="4">
-    <field name="Shadow Function" start="0" end="2" type="uint">
-      <value name="PREFILTEROP_ALWAYS" value="0"/>
-      <value name="PREFILTEROP_NEVER" value="1"/>
-      <value name="PREFILTEROP_LESS" value="2"/>
-      <value name="PREFILTEROP_EQUAL" value="3"/>
-      <value name="PREFILTEROP_LEQUAL" value="4"/>
-      <value name="PREFILTEROP_GREATER" value="5"/>
-      <value name="PREFILTEROP_NOTEQUAL" value="6"/>
-      <value name="PREFILTEROP_GEQUAL" value="7"/>
+    <field name="Shadow Function" start="0" end="2" type="uint" prefix="PREFILTEROP">
+      <value name="ALWAYS" value="0"/>
+      <value name="NEVER" value="1"/>
+      <value name="LESS" value="2"/>
+      <value name="EQUAL" value="3"/>
+      <value name="LEQUAL" value="4"/>
+      <value name="GREATER" value="5"/>
+      <value name="NOTEQUAL" value="6"/>
+      <value name="GEQUAL" value="7"/>
     </field>
     <field name="Texture LOD Bias" start="3" end="13" type="s4.6"/>
     <field name="Min Mode Filter" start="14" end="16" type="uint" prefix="MAPFILTER"/>
@@ -974,8 +974,7 @@
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="Physical Start Address Extension" start="32" end="35" type="address"/>
     <field name="Address" start="66" end="95" type="address"/>
-    <field name="Data DWord 0" start="96" end="127" type="uint"/>
-    <field name="Data DWord 1" start="128" end="159" type="uint"/>
+    <field name="Immediate Data" start="96" end="159" type="uint"/>
   </instruction>
 
   <instruction name="MI_STORE_REGISTER_MEM" bias="2" length="3">
@@ -1081,14 +1080,14 @@
     <field name="CS Fence" start="84" end="94" type="uint"/>
   </instruction>
 
-  <instruction name="XY_COLOR_BLT" bias="2" length="6" engine="blitter">
+  <instruction name="XY_COLOR_BLT" bias="2" length="6" engine="render">
     <field name="DWord Length" start="0" end="7" type="uint" default="4"/>
     <field name="Tiling Enable" start="11" end="11" type="bool"/>
     <field name="32bpp Byte Mask" start="20" end="21" type="uint"/>
     <field name="2D Command Opcode" start="22" end="28" type="uint" default="80"/>
     <field name="Command Type" start="29" end="31" type="uint" default="2"/>
     <field name="Destination Pitch" start="32" end="47" type="int"/>
-    <field name="Raster Operation" start="48" end="55" type="int"/>
+    <field name="Raster Operation" start="48" end="55" type="uint"/>
     <field name="Color Depth" start="56" end="58" type="uint" prefix="COLOR_DEPTH">
       <value name="8 bit" value="0"/>
       <value name="565" value="1"/>
@@ -1111,7 +1110,7 @@
     <field name="2D Command Opcode" start="22" end="28" type="uint" default="1"/>
     <field name="Command Type" start="29" end="31" type="uint" default="2"/>
     <field name="Destination Pitch" start="32" end="47" type="int"/>
-    <field name="Raster Operation" start="48" end="55" type="int"/>
+    <field name="Raster Operation" start="48" end="55" type="uint"/>
     <field name="Color Depth" start="56" end="57" type="uint" prefix="COLOR_DEPTH">
       <value name="8 bit" value="0"/>
       <value name="565" value="1"/>
@@ -1130,7 +1129,7 @@
     <field name="Pattern Base Address" start="224" end="255" type="uint"/>
   </instruction>
 
-  <instruction name="XY_SRC_COPY_BLT" bias="2" length="8" engine="blitter">
+  <instruction name="XY_SRC_COPY_BLT" bias="2" length="8" engine="render">
     <field name="DWord Length" start="0" end="7" type="uint" default="6"/>
     <field name="Destination Tiling Enable" start="11" end="11" type="bool"/>
     <field name="Source Tiling Enable" start="15" end="15" type="bool"/>
@@ -1138,7 +1137,7 @@
     <field name="2D Command Opcode" start="22" end="28" type="uint" default="83"/>
     <field name="Command Type" start="29" end="31" type="uint" default="2"/>
     <field name="Destination Pitch" start="32" end="47" type="int"/>
-    <field name="Raster Operation" start="48" end="55" type="int"/>
+    <field name="Raster Operation" start="48" end="55" type="uint"/>
     <field name="Color Depth" start="56" end="58" type="uint" prefix="COLOR_DEPTH">
       <value name="8 bit" value="0"/>
       <value name="565" value="1"/>
@@ -1157,7 +1156,7 @@
     <field name="Source Base Address" start="224" end="255" type="address"/>
   </instruction>
 
-  <instruction name="XY_TEXT_IMMEDIATE_BLT" bias="2" length="3" engine="blitter">
+  <instruction name="XY_TEXT_IMMEDIATE_BLT" bias="2" length="3" engine="render">
     <field name="DWord Length" start="0" end="7" type="uint" default="1"/>
     <field name="Tiling Enable" start="11" end="11" type="bool"/>
     <field name="Packing" start="16" end="16" type="uint">
diff --git a/lib/mesa/src/intel/genxml/gen6.xml b/lib/mesa/src/intel/genxml/gen6.xml
index 3940dc01d..386684338 100644
--- a/lib/mesa/src/intel/genxml/gen6.xml
+++ b/lib/mesa/src/intel/genxml/gen6.xml
@@ -360,15 +360,15 @@
   </struct>
 
   <struct name="SAMPLER_STATE" length="4">
-    <field name="Shadow Function" start="0" end="2" type="uint">
-      <value name="PREFILTEROP_ALWAYS" value="0"/>
-      <value name="PREFILTEROP_NEVER" value="1"/>
-      <value name="PREFILTEROP_LESS" value="2"/>
-      <value name="PREFILTEROP_EQUAL" value="3"/>
-      <value name="PREFILTEROP_LEQUAL" value="4"/>
-      <value name="PREFILTEROP_GREATER" value="5"/>
-      <value name="PREFILTEROP_NOTEQUAL" value="6"/>
-      <value name="PREFILTEROP_GEQUAL" value="7"/>
+    <field name="Shadow Function" start="0" end="2" type="uint" prefix="PREFILTEROP">
+      <value name="ALWAYS" value="0"/>
+      <value name="NEVER" value="1"/>
+      <value name="LESS" value="2"/>
+      <value name="EQUAL" value="3"/>
+      <value name="LEQUAL" value="4"/>
+      <value name="GREATER" value="5"/>
+      <value name="NOTEQUAL" value="6"/>
+      <value name="GEQUAL" value="7"/>
     </field>
     <field name="Texture LOD Bias" start="3" end="13" type="s4.6"/>
     <field name="Min Mode Filter" start="14" end="16" type="uint" prefix="MAPFILTER"/>
@@ -778,8 +778,8 @@
     </field>
   </instruction>
 
-  <instruction name="3DSTATE_GS_SVB_INDEX" bias="2" length="7" engine="render">
-    <field name="DWord Length" start="0" end="7" type="uint" default="5"/>
+  <instruction name="3DSTATE_GS_SVB_INDEX" bias="2" length="4" engine="render">
+    <field name="DWord Length" start="0" end="7" type="uint" default="2"/>
     <field name="3D Command Sub Opcode" start="16" end="23" type="uint" default="11"/>
     <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"/>
@@ -2486,7 +2486,7 @@
   </instruction>
 
   <instruction name="MI_FLUSH_DW" bias="2" length="4" engine="video">
-    <field name="DWord Length" start="0" end="5" type="uint"/>
+    <field name="DWord Length" start="0" end="5" type="uint" default="2"/>
     <field name="Video Pipeline Cache Invalidate" start="7" end="7" type="bool"/>
     <field name="Notify Enable" start="8" end="8" type="bool"/>
     <field name="Post-Sync Operation" start="14" end="15" type="uint"/>
diff --git a/lib/mesa/src/intel/genxml/gen7.xml b/lib/mesa/src/intel/genxml/gen7.xml
index bb59c87a8..f63684488 100644
--- a/lib/mesa/src/intel/genxml/gen7.xml
+++ b/lib/mesa/src/intel/genxml/gen7.xml
@@ -473,15 +473,15 @@
       <value name="PROGRAMMED" value="0"/>
       <value name="OVERRIDE" value="1"/>
     </field>
-    <field name="Shadow Function" start="33" end="35" type="uint">
-      <value name="PREFILTEROP ALWAYS" value="0"/>
-      <value name="PREFILTEROP NEVER" value="1"/>
-      <value name="PREFILTEROP LESS" value="2"/>
-      <value name="PREFILTEROP EQUAL" value="3"/>
-      <value name="PREFILTEROP LEQUAL" value="4"/>
-      <value name="PREFILTEROP GREATER" value="5"/>
-      <value name="PREFILTEROP NOTEQUAL" value="6"/>
-      <value name="PREFILTEROP GEQUAL" value="7"/>
+    <field name="Shadow Function" start="33" end="35" type="uint" prefix="PREFILTEROP">
+      <value name="ALWAYS" value="0"/>
+      <value name="NEVER" value="1"/>
+      <value name="LESS" value="2"/>
+      <value name="EQUAL" value="3"/>
+      <value name="LEQUAL" value="4"/>
+      <value name="GREATER" value="5"/>
+      <value name="NOTEQUAL" value="6"/>
+      <value name="GEQUAL" value="7"/>
     </field>
     <field name="Max LOD" start="40" end="51" type="u4.8"/>
     <field name="Min LOD" start="52" end="63" type="u4.8"/>
@@ -1931,7 +1931,7 @@
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Per Thread Scratch Space" start="32" end="35" type="uint"/>
     <field name="Scratch Space Base Pointer" start="42" end="63" type="address"/>
-    <field name="GPGPU Mode" start="66" end="66" type="uint"/>
+    <field name="GPGPU Mode" start="66" end="66" type="bool"/>
     <field name="Gateway MMIO Access Control" start="67" end="68" type="uint">
       <value name="No MMIO read/write allowed" value="0"/>
       <value name="MMIO read/write to any address" value="2"/>
@@ -3336,7 +3336,7 @@
   </instruction>
 
   <instruction name="MI_FLUSH_DW" bias="2" length="4" engine="video">
-    <field name="DWord Length" start="0" end="5" type="uint"/>
+    <field name="DWord Length" start="0" end="5" type="uint" default="2"/>
     <field name="Video Pipeline Cache Invalidate" start="7" end="7" type="bool"/>
     <field name="Notify Enable" start="8" end="8" type="bool"/>
     <field name="Post-Sync Operation" start="14" end="15" type="uint"/>
diff --git a/lib/mesa/src/intel/genxml/gen75.xml b/lib/mesa/src/intel/genxml/gen75.xml
index cffb21af8..3b634ac49 100644
--- a/lib/mesa/src/intel/genxml/gen75.xml
+++ b/lib/mesa/src/intel/genxml/gen75.xml
@@ -577,15 +577,15 @@
       <value name="PROGRAMMED" value="0"/>
       <value name="OVERRIDE" value="1"/>
     </field>
-    <field name="Shadow Function" start="33" end="35" type="uint">
-      <value name="PREFILTEROP ALWAYS" value="0"/>
-      <value name="PREFILTEROP NEVER" value="1"/>
-      <value name="PREFILTEROP LESS" value="2"/>
-      <value name="PREFILTEROP EQUAL" value="3"/>
-      <value name="PREFILTEROP LEQUAL" value="4"/>
-      <value name="PREFILTEROP GREATER" value="5"/>
-      <value name="PREFILTEROP NOTEQUAL" value="6"/>
-      <value name="PREFILTEROP GEQUAL" value="7"/>
+    <field name="Shadow Function" start="33" end="35" type="uint" prefix="PREFILTEROP">
+      <value name="ALWAYS" value="0"/>
+      <value name="NEVER" value="1"/>
+      <value name="LESS" value="2"/>
+      <value name="EQUAL" value="3"/>
+      <value name="LEQUAL" value="4"/>
+      <value name="GREATER" value="5"/>
+      <value name="NOTEQUAL" value="6"/>
+      <value name="GEQUAL" value="7"/>
     </field>
     <field name="Max LOD" start="40" end="51" type="u4.8"/>
     <field name="Min LOD" start="52" end="63" type="u4.8"/>
@@ -2305,7 +2305,7 @@
     <field name="Per Thread Scratch Space" start="32" end="35" type="uint"/>
     <field name="Stack Size" start="36" end="39" type="uint"/>
     <field name="Scratch Space Base Pointer" start="42" end="63" type="address"/>
-    <field name="GPGPU Mode" start="66" end="66" type="uint"/>
+    <field name="GPGPU Mode" start="66" end="66" type="bool"/>
     <field name="Bypass Gateway Control" start="70" end="70" type="uint">
       <value name="Maintaining OpenGateway/ForwardMsg/CloseGateway protocol (legacy mode)" value="0"/>
       <value name="Bypassing OpenGateway/CloseGateway protocol" value="1"/>
@@ -3638,7 +3638,7 @@
   </instruction>
 
   <instruction name="MI_FLUSH_DW" bias="2" length="4" engine="video">
-    <field name="DWord Length" start="0" end="5" type="uint"/>
+    <field name="DWord Length" start="0" end="5" type="uint" default="2"/>
     <field name="Video Pipeline Cache Invalidate" start="7" end="7" type="bool"/>
     <field name="Notify Enable" start="8" end="8" type="bool"/>
     <field name="Post-Sync Operation" start="14" end="15" type="uint"/>
diff --git a/lib/mesa/src/intel/genxml/gen8.xml b/lib/mesa/src/intel/genxml/gen8.xml
index 45462b7ef..e4ae34219 100644
--- a/lib/mesa/src/intel/genxml/gen8.xml
+++ b/lib/mesa/src/intel/genxml/gen8.xml
@@ -496,14 +496,14 @@
       <value name="YMAJOR" value="3"/>
     </field>
     <field name="Surface Horizontal Alignment" start="14" end="15" type="uint">
-      <value name="HALIGN 4" value="1"/>
-      <value name="HALIGN 8" value="2"/>
-      <value name="HALIGN 16" value="3"/>
+      <value name="HALIGN_4" value="1"/>
+      <value name="HALIGN_8" value="2"/>
+      <value name="HALIGN_16" value="3"/>
     </field>
     <field name="Surface Vertical Alignment" start="16" end="17" type="uint">
-      <value name="VALIGN 4" value="1"/>
-      <value name="VALIGN 8" value="2"/>
-      <value name="VALIGN 16" value="3"/>
+      <value name="VALIGN_4" value="1"/>
+      <value name="VALIGN_8" value="2"/>
+      <value name="VALIGN_16" value="3"/>
     </field>
     <field name="Surface Format" start="18" end="26" type="uint"/>
     <field name="Surface Array" start="28" end="28" type="bool"/>
@@ -625,15 +625,15 @@
       <value name="PROGRAMMED" value="0"/>
       <value name="OVERRIDE" value="1"/>
     </field>
-    <field name="Shadow Function" start="33" end="35" type="uint">
-      <value name="PREFILTEROP ALWAYS" value="0"/>
-      <value name="PREFILTEROP NEVER" value="1"/>
-      <value name="PREFILTEROP LESS" value="2"/>
-      <value name="PREFILTEROP EQUAL" value="3"/>
-      <value name="PREFILTEROP LEQUAL" value="4"/>
-      <value name="PREFILTEROP GREATER" value="5"/>
-      <value name="PREFILTEROP NOTEQUAL" value="6"/>
-      <value name="PREFILTEROP GEQUAL" value="7"/>
+    <field name="Shadow Function" start="33" end="35" type="uint" prefix="PREFILTEROP">
+      <value name="ALWAYS" value="0"/>
+      <value name="NEVER" value="1"/>
+      <value name="LESS" value="2"/>
+      <value name="EQUAL" value="3"/>
+      <value name="LEQUAL" value="4"/>
+      <value name="GREATER" value="5"/>
+      <value name="NOTEQUAL" value="6"/>
+      <value name="GEQUAL" value="7"/>
     </field>
     <field name="ChromaKey Mode" start="36" end="36" type="uint">
       <value name="KEYFILTER_KILL_ON_ANY_MATCH" value="0"/>
@@ -4152,7 +4152,7 @@
   </instruction>
 
   <instruction name="MI_FLUSH_DW" bias="2" length="5" engine="video">
-    <field name="DWord Length" start="0" end="5" type="uint"/>
+    <field name="DWord Length" start="0" end="5" type="uint" default="3"/>
     <field name="Video Pipeline Cache Invalidate" start="7" end="7" type="bool"/>
     <field name="Notify Enable" start="8" end="8" type="bool"/>
     <field name="Post-Sync Operation" start="14" end="15" type="uint"/>
diff --git a/lib/mesa/src/intel/genxml/gen9.xml b/lib/mesa/src/intel/genxml/gen9.xml
index 3c9c42e6e..b9589f6f7 100644
--- a/lib/mesa/src/intel/genxml/gen9.xml
+++ b/lib/mesa/src/intel/genxml/gen9.xml
@@ -626,14 +626,14 @@
       <value name="YMAJOR" value="3"/>
     </field>
     <field name="Surface Horizontal Alignment" start="14" end="15" type="uint">
-      <value name="HALIGN 4" value="1"/>
-      <value name="HALIGN 8" value="2"/>
-      <value name="HALIGN 16" value="3"/>
+      <value name="HALIGN_4" value="1"/>
+      <value name="HALIGN_8" value="2"/>
+      <value name="HALIGN_16" value="3"/>
     </field>
     <field name="Surface Vertical Alignment" start="16" end="17" type="uint">
-      <value name="VALIGN 4" value="1"/>
-      <value name="VALIGN 8" value="2"/>
-      <value name="VALIGN 16" value="3"/>
+      <value name="VALIGN_4" value="1"/>
+      <value name="VALIGN_8" value="2"/>
+      <value name="VALIGN_16" value="3"/>
     </field>
     <field name="Surface Format" start="18" end="27" type="uint"/>
     <field name="Surface Array" start="28" end="28" type="bool"/>
@@ -787,15 +787,15 @@
       <value name="PROGRAMMED" value="0"/>
       <value name="OVERRIDE" value="1"/>
     </field>
-    <field name="Shadow Function" start="33" end="35" type="uint">
-      <value name="PREFILTEROP ALWAYS" value="0"/>
-      <value name="PREFILTEROP NEVER" value="1"/>
-      <value name="PREFILTEROP LESS" value="2"/>
-      <value name="PREFILTEROP EQUAL" value="3"/>
-      <value name="PREFILTEROP LEQUAL" value="4"/>
-      <value name="PREFILTEROP GREATER" value="5"/>
-      <value name="PREFILTEROP NOTEQUAL" value="6"/>
-      <value name="PREFILTEROP GEQUAL" value="7"/>
+    <field name="Shadow Function" start="33" end="35" type="uint" prefix="PREFILTEROP">
+      <value name="ALWAYS" value="0"/>
+      <value name="NEVER" value="1"/>
+      <value name="LESS" value="2"/>
+      <value name="EQUAL" value="3"/>
+      <value name="LEQUAL" value="4"/>
+      <value name="GREATER" value="5"/>
+      <value name="NOTEQUAL" value="6"/>
+      <value name="GEQUAL" value="7"/>
     </field>
     <field name="ChromaKey Mode" start="36" end="36" type="uint">
       <value name="KEYFILTER_KILL_ON_ANY_MATCH" value="0"/>
@@ -5536,7 +5536,7 @@
   </instruction>
 
   <instruction name="MI_FLUSH_DW" bias="2" length="5" engine="video">
-    <field name="DWord Length" start="0" end="5" type="uint"/>
+    <field name="DWord Length" start="0" end="5" type="uint" default="3"/>
     <field name="Video Pipeline Cache Invalidate" start="7" end="7" type="bool"/>
     <field name="Notify Enable" start="8" end="8" type="bool"/>
     <field name="Flush LLC" start="9" end="9" type="bool"/>
diff --git a/lib/mesa/src/intel/genxml/gen_bits_header.py b/lib/mesa/src/intel/genxml/gen_bits_header.py
index 8b5672973..38901461a 100644
--- a/lib/mesa/src/intel/genxml/gen_bits_header.py
+++ b/lib/mesa/src/intel/genxml/gen_bits_header.py
@@ -19,10 +19,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
-
 import argparse
 import os
 import xml.parsers.expat
@@ -67,7 +63,7 @@ from operator import itemgetter
 
 #include <stdint.h>
 
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "util/macros.h"
 
 <%def name="emit_per_gen_prop_func(item, prop)">
@@ -77,7 +73,7 @@ from operator import itemgetter
 % endfor
 
 static inline uint32_t ATTRIBUTE_PURE
-${item.token_name}_${prop}(const struct gen_device_info *devinfo)
+${item.token_name}_${prop}(const struct intel_device_info *devinfo)
 {
    switch (devinfo->verx10) {
    case 125: return ${item.get_prop(prop, 12.5)};
@@ -122,7 +118,7 @@ ${emit_per_gen_prop_func(field, 'start')}
 }
 #endif
 
-#endif /* ${guard} */""", output_encoding='utf-8')
+#endif /* ${guard} */""")
 
 class Gen(object):
 
@@ -328,7 +324,7 @@ def main():
         p.engines = set(engines)
         p.parse(source)
 
-    with open(pargs.output, 'wb') as f:
+    with open(pargs.output, 'w') as f:
         f.write(TEMPLATE.render(containers=containers, guard=pargs.cpp_guard))
 
 if __name__ == '__main__':
diff --git a/lib/mesa/src/intel/genxml/gen_pack_header.py b/lib/mesa/src/intel/genxml/gen_pack_header.py
index 74722046b..45bbb30c4 100644
--- a/lib/mesa/src/intel/genxml/gen_pack_header.py
+++ b/lib/mesa/src/intel/genxml/gen_pack_header.py
@@ -1,8 +1,5 @@
 #encoding=utf-8
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
 import argparse
 import ast
 import xml.parsers.expat
diff --git a/lib/mesa/src/intel/genxml/gen_zipped_file.py b/lib/mesa/src/intel/genxml/gen_zipped_file.py
index fd91f175b..d6af6e91f 100644
--- a/lib/mesa/src/intel/genxml/gen_zipped_file.py
+++ b/lib/mesa/src/intel/genxml/gen_zipped_file.py
@@ -22,7 +22,6 @@
 # IN THE SOFTWARE.
 #
 
-from __future__ import print_function
 import sys
 import zlib
 import xml.etree.ElementTree as et
@@ -35,7 +34,7 @@ def main():
     compress = zlib.compressobj()
 
     print("static const struct {")
-    print("   uint32_t gen_10;")
+    print("   uint32_t ver_10;")
     print("   uint32_t offset;")
     print("   uint32_t length;")
     print("} genxml_files_table[] = {")