Commit c690f0e6 authored by Haridhar Kalvala's avatar Haridhar Kalvala Committed by Rodrigo Vivi
Browse files

drm/xe: Rename MEM_SET instruction 



PVC_MS_* doesn't reflect the real name of the instruction. Rename
it to follow the name used in the bspec.

Cc: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarHaridhar Kalvala <haridhar.kalvala@intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Link: https://lore.kernel.org/r/20230929213640.3189912-3-lucas.demarchi@intel.com


Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 2c0ac321

drivers/gpu/drm/xe/regs/xe_gpu_commands.h

+3 −3
Original line number Diff line number Diff line
@@ -60,10 +60,10 @@ 


#define	PVC_MEM_SET_CMD		(2 << 29 | 0x5b << 22)

#define   PVC_MEM_SET_CMD_LEN_DW	7

#define   PVC_MS_MATRIX			REG_BIT(17)

#define   PVC_MS_DATA_FIELD		GENMASK(31, 24)

#define   PVC_MEM_SET_MATRIX		REG_BIT(17)

#define   PVC_MEM_SET_DATA_FIELD	GENMASK(31, 24)

/* Bspec lists field as [6:0], but index alone is from [6:1] */

#define   PVC_MS_MOCS_INDEX_MASK	GENMASK(6, 1)

#define   PVC_MEM_SET_MOCS_INDEX_MASK	GENMASK(6, 1)



#define GFX_OP_PIPE_CONTROL(len)	((0x3<<29)|(0x3<<27)|(0x2<<24)|((len)-2))

drivers/gpu/drm/xe/xe_migrate.c

+2 −2
Original line number Diff line number Diff line
@@ -809,13 +809,13 @@ static void emit_clear_link_copy(struct xe_gt *gt, struct xe_bb *bb, u64 src_ofs 
	u32 mocs = gt->mocs.uc_index;

	u32 len = PVC_MEM_SET_CMD_LEN_DW;



	*cs++ = PVC_MEM_SET_CMD | PVC_MS_MATRIX | (len - 2);

	*cs++ = PVC_MEM_SET_CMD | PVC_MEM_SET_MATRIX | (len - 2);

	*cs++ = pitch - 1;

	*cs++ = (size / pitch) - 1;

	*cs++ = pitch - 1;

	*cs++ = lower_32_bits(src_ofs);

	*cs++ = upper_32_bits(src_ofs);

	*cs++ = FIELD_PREP(PVC_MS_MOCS_INDEX_MASK, mocs);

	*cs++ = FIELD_PREP(PVC_MEM_SET_MOCS_INDEX_MASK, mocs);



	xe_gt_assert(gt, cs - bb->cs == len + bb->len);