Mesa (staging/21.2): intel/genxml: fix raster operation field in blt genxml

[GitLab Mirror]

Module: Mesa
Branch: staging/21.2
Commit: 9fc8ae0cd52ac1edcfb28a460ad6efd47a3b2785
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9fc8ae0cd52ac1edcfb28a460ad6efd47a3b2785

Author: Dave Airlie <airlied at gmail.com>
Date:   Sun Aug  1 19:59:10 2021 -0400

intel/genxml: fix raster operation field in blt genxml

This field should be a uint, further changes on top of previous
ones in this area

Fixes: 4d80ec8fcfaad ("intel/genxml: fix raster op fields on gen4/5")
Acked-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12164>
(cherry picked from commit de625dddeea4c134a713a96efa4fd8d19fdee823)

---

 .pick_status.json          | 2 +-
 src/intel/genxml/gen4.xml  | 2 +-
 src/intel/genxml/gen45.xml | 2 +-
 src/intel/genxml/gen5.xml  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index c3738d48647..d514960e3a2 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -13,7 +13,7 @@
         "description": "intel/genxml: fix raster operation field in blt genxml",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "4d80ec8fcfaad3f8e29aeb1f2e07042333ebcb6b"
     },
diff --git a/src/intel/genxml/gen4.xml b/src/intel/genxml/gen4.xml
index d0d3c3c7d78..06d3ccb94c0 100644
--- a/src/intel/genxml/gen4.xml
+++ b/src/intel/genxml/gen4.xml
@@ -999,7 +999,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"/>
diff --git a/src/intel/genxml/gen45.xml b/src/intel/genxml/gen45.xml
index 9045d58b9ec..a5b0a884fc8 100644
--- a/src/intel/genxml/gen45.xml
+++ b/src/intel/genxml/gen45.xml
@@ -1009,7 +1009,7 @@
     <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"/>
diff --git a/src/intel/genxml/gen5.xml b/src/intel/genxml/gen5.xml
index f2a3402821d..85acb5ac21f 100644
--- a/src/intel/genxml/gen5.xml
+++ b/src/intel/genxml/gen5.xml
@@ -1087,7 +1087,7 @@
     <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"/>