Commit e8372ede authored by Tvrtko Ursulin's avatar Tvrtko Ursulin Committed by Lucas De Marchi
Browse files

drm/xe/xelp: Implement Wa_16010904313 



Add XeLP workaround 16010904313.

The description calls for it to be emitted as the indirect context buffer
workaround for render and compute, and from the workaround batch buffer
for the other engines. Therefore we plug into the previously added
respective top level emission functions.

The actual command streamer programming sequence differs from what is
described in the PRM, in that it assumes the listed LRCA offset was
supposed to actually refer to the location of the CTX_TIMESTAMP register
instead of LRCA + 0x180c (which is in GPR space). Latter appears to make
more sense under the assumption that multiple writes are helping with
restoring the CTX_TIMESTAMP register content from the saved context state.

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@igalia.com>
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Cc: Matt Roper <matthew.d.roper@intel.com>
Link: https://lore.kernel.org/r/20250711160153.49833-8-tvrtko.ursulin@igalia.com


Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
parent 9b807f0b

drivers/gpu/drm/xe/instructions/xe_mi_commands.h

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ 


#define MI_LOAD_REGISTER_MEM		(__MI_INSTR(0x29) | XE_INSTR_NUM_DW(4))

#define   MI_LRM_USE_GGTT		REG_BIT(22)

#define   MI_LRM_ASYNC			REG_BIT(21)



#define MI_LOAD_REGISTER_REG		(__MI_INSTR(0x2a) | XE_INSTR_NUM_DW(3))

#define   MI_LRR_DST_CS_MMIO		REG_BIT(19)

drivers/gpu/drm/xe/xe_lrc.c

+44 −0
Original line number Diff line number Diff line
@@ -76,6 +76,11 @@ lrc_to_xe(struct xe_lrc *lrc) 
static bool

gt_engine_needs_indirect_ctx(struct xe_gt *gt, enum xe_engine_class class)

{

	if (XE_WA(gt, 16010904313) &&

	    (class == XE_ENGINE_CLASS_RENDER ||

	     class == XE_ENGINE_CLASS_COMPUTE))

		return true;



	return false;

}
@@ -1014,6 +1019,43 @@ static ssize_t setup_utilization_wa(struct xe_lrc *lrc, 
	return cmd - batch;

}



static ssize_t setup_timestamp_wa(struct xe_lrc *lrc, struct xe_hw_engine *hwe,

				  u32 *batch, size_t max_len)

{

	const u32 ts_addr = __xe_lrc_ctx_timestamp_ggtt_addr(lrc);

	u32 *cmd = batch;



	if (!XE_WA(lrc->gt, 16010904313) ||

	    !(hwe->class == XE_ENGINE_CLASS_RENDER ||

	      hwe->class == XE_ENGINE_CLASS_COMPUTE ||

	      hwe->class == XE_ENGINE_CLASS_COPY ||

	      hwe->class == XE_ENGINE_CLASS_VIDEO_DECODE ||

	      hwe->class == XE_ENGINE_CLASS_VIDEO_ENHANCE))

		return 0;



	if (xe_gt_WARN_ON(lrc->gt, max_len < 12))

		return -ENOSPC;



	*cmd++ = MI_LOAD_REGISTER_MEM | MI_LRM_USE_GGTT | MI_LRI_LRM_CS_MMIO |

		 MI_LRM_ASYNC;

	*cmd++ = RING_CTX_TIMESTAMP(0).addr;

	*cmd++ = ts_addr;

	*cmd++ = 0;



	*cmd++ = MI_LOAD_REGISTER_MEM | MI_LRM_USE_GGTT | MI_LRI_LRM_CS_MMIO |

		 MI_LRM_ASYNC;

	*cmd++ = RING_CTX_TIMESTAMP(0).addr;

	*cmd++ = ts_addr;

	*cmd++ = 0;



	*cmd++ = MI_LOAD_REGISTER_MEM | MI_LRM_USE_GGTT | MI_LRI_LRM_CS_MMIO;

	*cmd++ = RING_CTX_TIMESTAMP(0).addr;

	*cmd++ = ts_addr;

	*cmd++ = 0;



	return cmd - batch;

}



struct bo_setup {

	ssize_t (*setup)(struct xe_lrc *lrc, struct xe_hw_engine *hwe,

			 u32 *batch, size_t max_size);
@@ -1089,6 +1131,7 @@ static void finish_bo(struct bo_setup_state *state) 
static int setup_wa_bb(struct xe_lrc *lrc, struct xe_hw_engine *hwe)

{

	static const struct bo_setup funcs[] = {

		{ .setup = setup_timestamp_wa },

		{ .setup = setup_utilization_wa },

	};

	struct bo_setup_state state = {
@@ -1121,6 +1164,7 @@ static int 
setup_indirect_ctx(struct xe_lrc *lrc, struct xe_hw_engine *hwe)

{

	static struct bo_setup rcs_funcs[] = {

		{ .setup = setup_timestamp_wa },

	};

	struct bo_setup_state state = {

		.lrc = lrc,

drivers/gpu/drm/xe/xe_wa_oob.rules

+1 −0
Original line number Diff line number Diff line 
1607983814	GRAPHICS_VERSION_RANGE(1200, 1210)

16010904313	GRAPHICS_VERSION_RANGE(1200, 1210)

22012773006	GRAPHICS_VERSION_RANGE(1200, 1250)

14014475959	GRAPHICS_VERSION_RANGE(1270, 1271), GRAPHICS_STEP(A0, B0)

		PLATFORM(DG2)