Module: Mesa Branch: staging/21.3 Commit: 4aa56b6e59ce1fe7027083abc8b56fd6c3f45e25 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4aa56b6e59ce1fe7027083abc8b56fd6c3f45e25
Author: Dave Airlie <[email protected]> Date: Thu Dec 30 11:25:13 2021 +1000 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 <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14345> (cherry picked from commit a2293e33fd1255049b61c57d93eb89d1dc19c1f0) --- .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 c5a117821d7..0ac9cd51760 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -742,7 +742,7 @@ "description": "intel/genxml/gen4-5: fix more Raster Operation in BLT to be a uint", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "de625dddeea4c134a713a96efa4fd8d19fdee823" }, diff --git a/src/intel/genxml/gen4.xml b/src/intel/genxml/gen4.xml index 06d3ccb94c0..c0ad311b41d 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"/>
