genxml: Make X/Y Offset field of SURFACE_STATE a uint

THe offset type has special implications that it's intended to be some form
of aligned memory address.  These assumptions allow it to handle the case
where there is some alignment requirement on the offset and the bottom bits
are used for other things.  However, the offsets in the surface state field
are really just unsigned integers.

Signed-off-by: Jason Ekstrand <[email protected]>
Reviewed-by: Chad Versace <[email protected]>

7 files changed, 14 insertions, 14 deletions

diff --git a/src/intel/genxml/gen45.xml b/src/intel/genxml/gen45.xml
index 973b3bb32ea..ae483b7091c 100644
--- a/src/intel/genxml/gen45.xml
+++ b/src/intel/genxml/gen45.xml
@@ -50,7 +50,7 @@
     <field name="Surface Min LOD" start="156" end="159" type="uint"/>
     <field name="Minimum Array Element" start="145" end="155" type="uint"/>
     <field name="Render Target View Extent" start="136" end="144" type="uint"/>
-    <field name="X Offset" start="185" end="191" type="offset"/>
-    <field name="Y Offset" start="180" end="183" type="offset"/>
+    <field name="X Offset" start="185" end="191" type="uint"/>
+    <field name="Y Offset" start="180" end="183" type="uint"/>
   </struct>
 </genxml>
diff --git a/src/intel/genxml/gen5.xml b/src/intel/genxml/gen5.xml
index 37e1ac4f8dd..cb6a7b6bcb0 100644
--- a/src/intel/genxml/gen5.xml
+++ b/src/intel/genxml/gen5.xml
@@ -50,7 +50,7 @@
     <field name="Surface Min LOD" start="156" end="159" type="uint"/>
     <field name="Minimum Array Element" start="145" end="155" type="uint"/>
     <field name="Render Target View Extent" start="136" end="144" type="uint"/>
-    <field name="X Offset" start="185" end="191" type="offset"/>
-    <field name="Y Offset" start="180" end="183" type="offset"/>
+    <field name="X Offset" start="185" end="191" type="uint"/>
+    <field name="Y Offset" start="180" end="183" type="uint"/>
   </struct>
 </genxml>
diff --git a/src/intel/genxml/gen6.xml b/src/intel/genxml/gen6.xml
index dd682dda660..c465288e891 100644
--- a/src/intel/genxml/gen6.xml
+++ b/src/intel/genxml/gen6.xml
@@ -361,12 +361,12 @@
       <value name="MULTISAMPLECOUNT_4" value="2"/>
     </field>
     <field name="Multisample Position Palette Index" start="128" end="130" type="uint"/>
-    <field name="X Offset" start="185" end="191" type="offset"/>
+    <field name="X Offset" start="185" end="191" type="uint"/>
     <field name="Surface Vertical Alignment" start="184" end="184" type="uint">
       <value name="VALIGN_2" value="0"/>
       <value name="VALIGN_4" value="1"/>
     </field>
-    <field name="Y Offset" start="180" end="183" type="offset"/>
+    <field name="Y Offset" start="180" end="183" type="uint"/>
     <field name="Surface Object Control State" start="176" end="179" type="MEMORY_OBJECT_CONTROL_STATE"/>
     <field name="MOCS" start="176" end="179" type="uint"/>
   </struct>
diff --git a/src/intel/genxml/gen7.xml b/src/intel/genxml/gen7.xml
index 15640011626..b1c324f66d4 100644
--- a/src/intel/genxml/gen7.xml
+++ b/src/intel/genxml/gen7.xml
@@ -394,8 +394,8 @@
     </field>
     <field name="Multisample Position Palette Index" start="128" end="130" type="uint"/>
     <field name="Strbuf Minimum Array Element" start="128" end="154" type="uint"/>
-    <field name="X Offset" start="185" end="191" type="offset"/>
-    <field name="Y Offset" start="180" end="183" type="offset"/>
+    <field name="X Offset" start="185" end="191" type="uint"/>
+    <field name="Y Offset" start="180" end="183" type="uint"/>
     <field name="Surface Object Control State" start="176" end="179" type="MEMORY_OBJECT_CONTROL_STATE"/>
     <field name="MOCS" start="176" end="179" type="uint"/>
     <field name="Surface Min LOD" start="164" end="167" type="uint"/>
diff --git a/src/intel/genxml/gen75.xml b/src/intel/genxml/gen75.xml
index d813b7b7be2..1239164d400 100644
--- a/src/intel/genxml/gen75.xml
+++ b/src/intel/genxml/gen75.xml
@@ -405,8 +405,8 @@
     </field>
     <field name="Multisample Position Palette Index" start="128" end="130" type="uint"/>
     <field name="Strbuf Minimum Array Element" start="128" end="154" type="uint"/>
-    <field name="X Offset" start="185" end="191" type="offset"/>
-    <field name="Y Offset" start="180" end="183" type="offset"/>
+    <field name="X Offset" start="185" end="191" type="uint"/>
+    <field name="Y Offset" start="180" end="183" type="uint"/>
     <field name="Surface Object Control State" start="176" end="179" type="MEMORY_OBJECT_CONTROL_STATE"/>
     <field name="MOCS" start="176" end="179" type="uint"/>
     <field name="Surface Min LOD" start="164" end="167" type="uint"/>
diff --git a/src/intel/genxml/gen8.xml b/src/intel/genxml/gen8.xml
index 80d40fbac55..97af1913aca 100644
--- a/src/intel/genxml/gen8.xml
+++ b/src/intel/genxml/gen8.xml
@@ -317,8 +317,8 @@
       <value name="MULTISAMPLECOUNT_8" value="3"/>
     </field>
     <field name="Multisample Position Palette Index" start="128" end="130" type="uint"/>
-    <field name="X Offset" start="185" end="191" type="offset"/>
-    <field name="Y Offset" start="181" end="183" type="offset"/>
+    <field name="X Offset" start="185" end="191" type="uint"/>
+    <field name="Y Offset" start="181" end="183" type="uint"/>
     <field name="EWA Disable For Cube" start="180" end="180" type="bool"/>
     <field name="Coherency Type" start="174" end="174" type="uint">
       <value name="GPU coherent" value="0"/>
diff --git a/src/intel/genxml/gen9.xml b/src/intel/genxml/gen9.xml
index 94b7d289086..5e3e2e13274 100644
--- a/src/intel/genxml/gen9.xml
+++ b/src/intel/genxml/gen9.xml
@@ -324,8 +324,8 @@
       <value name="MULTISAMPLECOUNT_16" value="4"/>
     </field>
     <field name="Multisample Position Palette Index" start="128" end="130" type="uint"/>
-    <field name="X Offset" start="185" end="191" type="offset"/>
-    <field name="Y Offset" start="181" end="183" type="offset"/>
+    <field name="X Offset" start="185" end="191" type="uint"/>
+    <field name="Y Offset" start="181" end="183" type="uint"/>
     <field name="EWA Disable For Cube" start="180" end="180" type="bool"/>
     <field name="Tiled Resource Mode" start="178" end="179" type="uint">
       <value name="NONE" value="0"/>