diff options
| author | Lucas De Marchi <lucas.demarchi@intel.com> | 2023-04-12 16:28:45 -0700 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2023-12-19 18:31:46 -0500 |
| commit | 56492dacee943dd8241e29fe6a2d698d0029035c (patch) | |
| tree | 9ced8ef1422ab07442f13f1b7026cd147c7c5e07 /drivers/gpu/drm/xe | |
| parent | bb36f4b4ed279c7deed936957f733b2af0d3d78f (diff) | |
| download | linux-stable-56492dacee943dd8241e29fe6a2d698d0029035c.tar.gz linux-stable-56492dacee943dd8241e29fe6a2d698d0029035c.tar.bz2 linux-stable-56492dacee943dd8241e29fe6a2d698d0029035c.zip | |
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>
Diffstat (limited to 'drivers/gpu/drm/xe')
| -rw-r--r-- | drivers/gpu/drm/xe/regs/xe_gpu_commands.h | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/xe/xe_migrate.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/xe/regs/xe_gpu_commands.h b/drivers/gpu/drm/xe/regs/xe_gpu_commands.h index 9d6508d74d62..05531d43514f 100644 --- 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 a8e66b84dc63..d7da5bf2d984 100644 --- 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); |