From e5169714ea6ce26bfb55dcbca47db2aa7da6927c Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@gmail.com>
Date: Tue, 22 Dec 2020 13:25:59 +1000
Subject: [PATCH] intel/gemxml: move blitter command to render on gen4/5

The blitter commands don't show up in INTEL_DEBUG=bat, but on
gen4/5 they are emitted on the render engine ring so just change
the XML to reflect that.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10636>
---
 src/intel/genxml/gen4.xml  | 8 ++++----
 src/intel/genxml/gen45.xml | 8 ++++----
 src/intel/genxml/gen5.xml  | 6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/intel/genxml/gen4.xml b/src/intel/genxml/gen4.xml
index 7ef84fa9355..b6be2b28ca7 100644
--- a/src/intel/genxml/gen4.xml
+++ b/src/intel/genxml/gen4.xml
@@ -969,7 +969,7 @@
     <field name="CS Fence" start="84" end="94" type="uint"/>
   </instruction>
 
-  <instruction name="XY_COLOR_BLT" bias="2" length="6" engine="blitter">
+  <instruction name="XY_COLOR_BLT" bias="2" length="6" engine="render">
     <field name="DWord Length" start="0" end="7" type="uint" default="4"/>
     <field name="Tiling Enable" start="11" end="11" type="bool"/>
     <field name="32bpp Byte Mask" start="20" end="21" type="uint"/>
@@ -992,7 +992,7 @@
     <field name="Solid Pattern Color" start="160" end="191" type="int"/>
   </instruction>
 
-  <instruction name="XY_SETUP_BLT" bias="2" length="8" engine="blitter">
+  <instruction name="XY_SETUP_BLT" bias="2" length="8" engine="render">
     <field name="DWord Length" start="0" end="7" type="uint" default="6"/>
     <field name="Tiling Enable" start="11" end="11" type="bool"/>
     <field name="32bpp Byte Mask" start="20" end="21" type="uint"/>
@@ -1018,7 +1018,7 @@
     <field name="Pattern Base Address" start="224" end="255" type="uint"/>
   </instruction>
 
-  <instruction name="XY_SRC_COPY_BLT" bias="2" length="8" engine="blitter">
+  <instruction name="XY_SRC_COPY_BLT" bias="2" length="8" engine="render">
     <field name="DWord Length" start="0" end="7" type="uint" default="6"/>
     <field name="Destination Tiling Enable" start="11" end="11" type="bool"/>
     <field name="Source Tiling Enable" start="15" end="15" type="bool"/>
@@ -1045,7 +1045,7 @@
     <field name="Source Base Address" start="224" end="255" type="address"/>
   </instruction>
 
-  <instruction name="XY_TEXT_IMMEDIATE_BLT" bias="2" length="3" engine="blitter">
+  <instruction name="XY_TEXT_IMMEDIATE_BLT" bias="2" length="3" engine="render">
     <field name="DWord Length" start="0" end="7" type="uint" default="1"/>
     <field name="Tiling Enable" start="11" end="11" type="bool"/>
     <field name="Packing" start="16" end="16" type="uint">
diff --git a/src/intel/genxml/gen45.xml b/src/intel/genxml/gen45.xml
index 4ccb4664b62..7931f0d7ddf 100644
--- a/src/intel/genxml/gen45.xml
+++ b/src/intel/genxml/gen45.xml
@@ -1002,7 +1002,7 @@
     <field name="CS Fence" start="84" end="94" type="uint"/>
   </instruction>
 
-  <instruction name="XY_COLOR_BLT" bias="2" length="6" engine="blitter">
+  <instruction name="XY_COLOR_BLT" bias="2" length="6" engine="render">
     <field name="DWord Length" start="0" end="7" type="uint" default="4"/>
     <field name="Tiling Enable" start="11" end="11" type="bool"/>
     <field name="32bpp Byte Mask" start="20" end="21" type="uint"/>
@@ -1025,7 +1025,7 @@
     <field name="Solid Pattern Color" start="160" end="191" type="int"/>
   </instruction>
 
-  <instruction name="XY_SETUP_BLT" bias="2" length="8" engine="blitter">
+  <instruction name="XY_SETUP_BLT" bias="2" length="8" engine="render">
     <field name="DWord Length" start="0" end="7" type="uint" default="6"/>
     <field name="Tiling Enable" start="11" end="11" type="bool"/>
     <field name="32bpp Byte Mask" start="20" end="21" type="uint"/>
@@ -1051,7 +1051,7 @@
     <field name="Pattern Base Address" start="224" end="255" type="uint"/>
   </instruction>
 
-  <instruction name="XY_SRC_COPY_BLT" bias="2" length="8" engine="blitter">
+  <instruction name="XY_SRC_COPY_BLT" bias="2" length="8" engine="render">
     <field name="DWord Length" start="0" end="7" type="uint" default="6"/>
     <field name="Destination Tiling Enable" start="11" end="11" type="bool"/>
     <field name="Source Tiling Enable" start="15" end="15" type="bool"/>
@@ -1078,7 +1078,7 @@
     <field name="Source Base Address" start="224" end="255" type="address"/>
   </instruction>
 
-  <instruction name="XY_TEXT_IMMEDIATE_BLT" bias="2" length="3" engine="blitter">
+  <instruction name="XY_TEXT_IMMEDIATE_BLT" bias="2" length="3" engine="render">
     <field name="DWord Length" start="0" end="7" type="uint" default="1"/>
     <field name="Tiling Enable" start="11" end="11" type="bool"/>
     <field name="Packing" start="16" end="16" type="uint">
diff --git a/src/intel/genxml/gen5.xml b/src/intel/genxml/gen5.xml
index 97d3d7cd2dd..64b561a3746 100644
--- a/src/intel/genxml/gen5.xml
+++ b/src/intel/genxml/gen5.xml
@@ -1080,7 +1080,7 @@
     <field name="CS Fence" start="84" end="94" type="uint"/>
   </instruction>
 
-  <instruction name="XY_COLOR_BLT" bias="2" length="6" engine="blitter">
+  <instruction name="XY_COLOR_BLT" bias="2" length="6" engine="render">
     <field name="DWord Length" start="0" end="7" type="uint" default="4"/>
     <field name="Tiling Enable" start="11" end="11" type="bool"/>
     <field name="32bpp Byte Mask" start="20" end="21" type="uint"/>
@@ -1129,7 +1129,7 @@
     <field name="Pattern Base Address" start="224" end="255" type="uint"/>
   </instruction>
 
-  <instruction name="XY_SRC_COPY_BLT" bias="2" length="8" engine="blitter">
+  <instruction name="XY_SRC_COPY_BLT" bias="2" length="8" engine="render">
     <field name="DWord Length" start="0" end="7" type="uint" default="6"/>
     <field name="Destination Tiling Enable" start="11" end="11" type="bool"/>
     <field name="Source Tiling Enable" start="15" end="15" type="bool"/>
@@ -1156,7 +1156,7 @@
     <field name="Source Base Address" start="224" end="255" type="address"/>
   </instruction>
 
-  <instruction name="XY_TEXT_IMMEDIATE_BLT" bias="2" length="3" engine="blitter">
+  <instruction name="XY_TEXT_IMMEDIATE_BLT" bias="2" length="3" engine="render">
     <field name="DWord Length" start="0" end="7" type="uint" default="1"/>
     <field name="Tiling Enable" start="11" end="11" type="bool"/>
     <field name="Packing" start="16" end="16" type="uint">