From: Kenneth Graunke <kenneth@whitecape.org>
Date: Mon, 7 May 2018 18:40:24 +0000 (-0700)
Subject: intel/genxml: Fix some more fake booleans in genxml.
X-Git-Tag: android-x86-8.1-r1~3612
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f83fd929b71660067c53e98219d2e9c04d5d98db;p=android-x86%2Fexternal-mesa.git

intel/genxml: Fix some more fake booleans in genxml.

None of these are actually booleans.  Tile Parameter is a tiling mode
enum.  Display pipes take plane numbers.  Predicate Enable has some
operations (and the default value of 6 was particular bogus).

Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
---

diff --git a/src/intel/genxml/gen10.xml b/src/intel/genxml/gen10.xml
index 60238ae0c2b..67fda868193 100644
--- a/src/intel/genxml/gen10.xml
+++ b/src/intel/genxml/gen10.xml
@@ -2949,7 +2949,7 @@
     <field name="DWord Length" start="0" end="7" type="uint" default="1"/>
     <field name="Stereoscopic 3D Mode" start="63" end="63" type="bool"/>
     <field name="Display Buffer Pitch" start="38" end="47" type="uint"/>
-    <field name="Tile Parameter" start="32" end="34" type="bool"/>
+    <field name="Tile Parameter" start="32" end="34" type="uint"/>
     <field name="Display Buffer Base Address" start="76" end="95" type="address"/>
     <field name="VRR Master Flip" start="75" end="75" type="uint"/>
     <field name="Flip Type" start="64" end="65" type="uint">
@@ -3021,7 +3021,7 @@
       <value name="Display Plane 1 B" value="1"/>
       <value name="Display Plane 1 C" value="4"/>
     </field>
-    <field name="Scan Line Event Done Forward" start="17" end="18" type="bool"/>
+    <field name="Scan Line Event Done Forward" start="17" end="18" type="uint"/>
     <field name="DWord Length" start="0" end="5" type="uint" default="0"/>
     <field name="Start Scan Line Number" start="48" end="60" type="uint"/>
     <field name="End Scan Line Number" start="32" end="44" type="uint"/>
diff --git a/src/intel/genxml/gen11.xml b/src/intel/genxml/gen11.xml
index 893c5b21e52..dea1cd83aec 100644
--- a/src/intel/genxml/gen11.xml
+++ b/src/intel/genxml/gen11.xml
@@ -2934,7 +2934,7 @@
     <field name="DWord Length" start="0" end="7" type="uint" default="1"/>
     <field name="Stereoscopic 3D Mode" start="63" end="63" type="bool"/>
     <field name="Display Buffer Pitch" start="38" end="47" type="uint"/>
-    <field name="Tile Parameter" start="32" end="34" type="bool"/>
+    <field name="Tile Parameter" start="32" end="34" type="uint"/>
     <field name="Display Buffer Base Address" start="76" end="95" type="address"/>
     <field name="VRR Master Flip" start="75" end="75" type="uint"/>
     <field name="Flip Type" start="64" end="65" type="uint">
@@ -3016,7 +3016,7 @@
       <value name="Display Plane 1 C" value="4"/>
       <value name="Display Plane 1 D" value="5"/>
     </field>
-    <field name="Scan Line Event Done Forward" start="17" end="18" type="bool"/>
+    <field name="Scan Line Event Done Forward" start="17" end="18" type="uint"/>
     <field name="DWord Length" start="0" end="5" type="uint" default="0"/>
     <field name="Start Scan Line Number" start="48" end="60" type="uint"/>
     <field name="End Scan Line Number" start="32" end="44" type="uint"/>
@@ -3250,9 +3250,9 @@
   <instruction name="MI_WAIT_FOR_EVENT_2" bias="1" length="1">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="4"/>
-    <field name="Display Pipe Scan Line Wait Enable" start="12" end="14" type="bool"/>
-    <field name="Display Pipe Vertical Blank Wait Enable" start="8" end="10" type="bool"/>
-    <field name="Display Plane Flip Pending Wait Enable" start="0" end="5" type="bool"/>
+    <field name="Display Pipe Scan Line Wait Enable" start="12" end="14" type="uint"/>
+    <field name="Display Pipe Vertical Blank Wait Enable" start="8" end="10" type="uint"/>
+    <field name="Display Plane Flip Pending Wait Enable" start="0" end="5" type="uint"/>
   </instruction>
 
   <instruction name="PIPELINE_SELECT" bias="1" length="1">
diff --git a/src/intel/genxml/gen75.xml b/src/intel/genxml/gen75.xml
index fe59446d83f..54362bbb93c 100644
--- a/src/intel/genxml/gen75.xml
+++ b/src/intel/genxml/gen75.xml
@@ -2546,7 +2546,7 @@
   <instruction name="MI_SET_PREDICATE" bias="1" length="1">
     <field name="Command Type" start="29" end="31" type="uint" default="0"/>
     <field name="MI Command Opcode" start="23" end="28" type="uint" default="1"/>
-    <field name="PREDICATE ENABLE" start="0" end="1" type="bool" default="6"/>
+    <field name="PREDICATE ENABLE" start="0" end="1" type="uint"/>
   </instruction>
 
   <instruction name="MI_STORE_DATA_IMM" bias="2" length="4">
diff --git a/src/intel/genxml/gen8.xml b/src/intel/genxml/gen8.xml
index 0f3757034f3..24c91e2e578 100644
--- a/src/intel/genxml/gen8.xml
+++ b/src/intel/genxml/gen8.xml
@@ -2652,7 +2652,7 @@
       <value name="Display Plane B" value="1"/>
       <value name="Display Plane C" value="4"/>
     </field>
-    <field name="Scan Line Event Done Forward" start="17" end="18" type="bool"/>
+    <field name="Scan Line Event Done Forward" start="17" end="18" type="uint"/>
     <field name="DWord Length" start="0" end="5" type="uint" default="0"/>
     <field name="Start Scan Line Number" start="48" end="60" type="uint"/>
     <field name="End Scan Line Number" start="32" end="44" type="uint"/>
diff --git a/src/intel/genxml/gen9.xml b/src/intel/genxml/gen9.xml
index 7d3c74de74c..dbef0726f11 100644
--- a/src/intel/genxml/gen9.xml
+++ b/src/intel/genxml/gen9.xml
@@ -2868,7 +2868,7 @@
     <field name="DWord Length" start="0" end="7" type="uint" default="1"/>
     <field name="Stereoscopic 3D Mode" start="63" end="63" type="bool"/>
     <field name="Display Buffer Pitch" start="38" end="47" type="uint"/>
-    <field name="Tile Parameter" start="32" end="34" type="bool"/>
+    <field name="Tile Parameter" start="32" end="34" type="uint"/>
     <field name="Display Buffer Base Address" start="76" end="95" type="address"/>
     <field name="Flip Type" start="64" end="65" type="uint">
       <value name="Sync Flip" value="0"/>
@@ -2939,7 +2939,7 @@
       <value name="Display Plane 1 B" value="1"/>
       <value name="Display Plane 1 C" value="4"/>
     </field>
-    <field name="Scan Line Event Done Forward" start="17" end="18" type="bool"/>
+    <field name="Scan Line Event Done Forward" start="17" end="18" type="uint"/>
     <field name="DWord Length" start="0" end="5" type="uint" default="0"/>
     <field name="Start Scan Line Number" start="48" end="60" type="uint"/>
     <field name="End Scan Line Number" start="32" end="44" type="uint"/>