drm/xe: Rename instruction field to avoid confusion

There was both BLT_DEPTH_32 and XY_FAST_COLOR_BLT_DEPTH_32 - also add
the prefix to the first to make it clear this is about the FAST_**COPY**
operation. While at it, remove the GEN9_ prefix.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

diff --git a/drivers/gpu/drm/xe/regs/xe_gpu_commands.h b/drivers/gpu/drm/xe/regs/xe_gpu_commands.h
index 9d6508d74d6203aa4b57ab0d3f5c4ec42417c293..05531d43514f251bf5a499f0d6075bb47485ec32 100644 (file)
--- a/drivers/gpu/drm/xe/regs/xe_gpu_commands.h
+++ b/drivers/gpu/drm/xe/regs/xe_gpu_commands.h
@@ -55,8 +55,8 @@
 #define   XY_FAST_COLOR_BLT_MOCS_MASK  GENMASK(27, 21)
 #define   XY_FAST_COLOR_BLT_MEM_TYPE_SHIFT 31
 
-#define GEN9_XY_FAST_COPY_BLT_CMD      (2 << 29 | 0x42 << 22)
-#define   BLT_DEPTH_32                 (3<<24)
+#define XY_FAST_COPY_BLT_CMD           (2 << 29 | 0x42 << 22)
+#define   XY_FAST_COPY_BLT_DEPTH_32    (3<<24)
 
 #define        PVC_MEM_SET_CMD         (2 << 29 | 0x5b << 22)
 #define   PVC_MEM_SET_CMD_LEN_DW       7

diff --git a/drivers/gpu/drm/xe/xe_migrate.c b/drivers/gpu/drm/xe/xe_migrate.c
index a8e66b84dc63b4c4f7ad1adc8e7b57126c2d2feb..d7da5bf2d98428680848a18bbfb52992bcfb3aa2 100644 (file)
--- a/drivers/gpu/drm/xe/xe_migrate.c
+++ b/drivers/gpu/drm/xe/xe_migrate.c
@@ -518,8 +518,8 @@ static void emit_copy(struct xe_gt *gt, struct xe_bb *bb,
        XE_BUG_ON(pitch / 4 > S16_MAX);
        XE_BUG_ON(pitch > U16_MAX);
 
-       bb->cs[bb->len++] = GEN9_XY_FAST_COPY_BLT_CMD | (10 - 2);
-       bb->cs[bb->len++] = BLT_DEPTH_32 | pitch;
+       bb->cs[bb->len++] = XY_FAST_COPY_BLT_CMD | (10 - 2);
+       bb->cs[bb->len++] = XY_FAST_COPY_BLT_DEPTH_32 | pitch;
        bb->cs[bb->len++] = 0;
        bb->cs[bb->len++] = (size / pitch) << 16 | pitch / 4;
        bb->cs[bb->len++] = lower_32_bits(dst_ofs);