From a2293e33fd1255049b61c57d93eb89d1dc19c1f0 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Thu, 30 Dec 2021 11:25:13 +1000
Subject: [PATCH] intel/genxml/gen4-5: fix more Raster Operation in BLT to be a
 uint

This has been partly fixed twice before, but looks like some got missed.

Fixes arb_copy_image on gen4 with crocus

Fixes: de625dddeea4 ("intel/genxml: fix raster operation field in blt genxml")

Acked-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14345>
---
 src/intel/genxml/gen4.xml  | 2 +-
 src/intel/genxml/gen45.xml | 2 +-
 src/intel/genxml/gen5.xml  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/intel/genxml/gen4.xml b/src/intel/genxml/gen4.xml
index 4a221235b75..60b3fb129c4 100644
--- a/src/intel/genxml/gen4.xml
+++ b/src/intel/genxml/gen4.xml
@@ -976,7 +976,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/gen45.xml b/src/intel/genxml/gen45.xml
index a5b0a884fc8..218893185d8 100644
--- a/src/intel/genxml/gen45.xml
+++ b/src/intel/genxml/gen45.xml
@@ -1032,7 +1032,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/gen5.xml b/src/intel/genxml/gen5.xml
index 85acb5ac21f..5c13c782f46 100644
--- a/src/intel/genxml/gen5.xml
+++ b/src/intel/genxml/gen5.xml
@@ -1110,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"/>