From 96a3c83d60460151a2779ce5d60f0bf4c22420e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= <jose.souza@intel.com>
Date: Thu, 17 Apr 2025 12:24:21 -0700
Subject: [PATCH] intel: Fix the MOCS values in XY_BLOCK_COPY_BLT for Xe2+
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

One more instruction were the MOCS value was splited into two
registes.

Cc: mesa-stable
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34592>
(cherry picked from commit fcb6dfb29c76454a7e24c177609e6b5dfda79c94)
---
 .pick_status.json                     |  2 +-
 src/intel/blorp/blorp_genX_exec_brw.h | 10 ++++++++++
 src/intel/genxml/gen200.xml           |  5 +++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 2e81ac454d1..d4976ab0e5e 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -234,7 +234,7 @@
         "description": "intel: Fix the MOCS values in XY_BLOCK_COPY_BLT for Xe2+",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/intel/blorp/blorp_genX_exec_brw.h b/src/intel/blorp/blorp_genX_exec_brw.h
index e56c5280d6b..e4518a1e8a3 100644
--- a/src/intel/blorp/blorp_genX_exec_brw.h
+++ b/src/intel/blorp/blorp_genX_exec_brw.h
@@ -2011,7 +2011,12 @@ blorp_xy_block_copy_blt(struct blorp_batch *batch,
       blt.ColorDepth = xy_color_depth(fmtl);
 
       blt.DestinationPitch = (dst_surf->row_pitch_B / dst_pitch_unit) - 1;
+#if GFX_VERx10 >= 200
+      blt.DestinationMOCSindex = MOCS_GET_INDEX(params->dst.addr.mocs);
+      blt.DestinationEncryptEn = MOCS_GET_ENCRYPT_EN(params->dst.addr.mocs);
+#else
       blt.DestinationMOCS = params->dst.addr.mocs;
+#endif
       blt.DestinationTiling = xy_bcb_tiling(dst_surf);
       blt.DestinationX1 = dst_x0;
       blt.DestinationY1 = dst_y0;
@@ -2056,7 +2061,12 @@ blorp_xy_block_copy_blt(struct blorp_batch *batch,
       blt.SourceX1 = src_x0;
       blt.SourceY1 = src_y0;
       blt.SourcePitch = (src_surf->row_pitch_B / src_pitch_unit) - 1;
+#if GFX_VERx10 >= 200
+      blt.SourceMOCSindex = MOCS_GET_INDEX(params->src.addr.mocs);
+      blt.SourceEncryptEn = MOCS_GET_ENCRYPT_EN(params->src.addr.mocs);
+#else
       blt.SourceMOCS = params->src.addr.mocs;
+#endif
       blt.SourceTiling = xy_bcb_tiling(src_surf);
       blt.SourceBaseAddress = params->src.addr;
       blt.SourceXOffset = params->src.tile_x_sa;
diff --git a/src/intel/genxml/gen200.xml b/src/intel/genxml/gen200.xml
index 2addd9abf3b..55541799f7a 100644
--- a/src/intel/genxml/gen200.xml
+++ b/src/intel/genxml/gen200.xml
@@ -1163,7 +1163,8 @@
     <field name="Opcode" start="22" end="28" type="uint" default="0x41" />
     <field name="Client" start="29" end="31" type="uint" default="2" />
     <field name="Destination Pitch" start="32" end="49" type="uint" />
-    <field name="Destination MOCS" start="56" end="59" type="uint" nonzero="true" />
+    <field name="Destination Encrypt En" start="53" end="53" type="uint" />
+    <field name="Destination MOCS index" start="56" end="59" type="uint" nonzero="true" />
     <field name="Destination Tiling" start="62" end="63" type="uint" prefix="XY_TILE">
       <value name="LINEAR" value="0" />
       <value name="X" value="1" />
@@ -1185,7 +1186,7 @@
     <field name="Source Y1" start="240" end="255" type="int" />
     <field name="Source Pitch" start="256" end="273" type="uint" />
     <field name="Source Encrypt En" start="277" end="277" type="bool" />
-    <field name="Source MOCS" start="280" end="283" type="uint" />
+    <field name="Source MOCS index" start="280" end="283" type="uint" />
     <field name="Source Tiling" start="286" end="287" type="uint" prefix="XY_TILE">
       <value name="LINEAR" value="0" />
       <value name="X" value="1" />