[PATCH v6 03/19] drm/xe/xelp: Add Wa_1607983814

[Tvrtko Ursulin]

On 14/05/2025 14:38, Tvrtko Ursulin wrote:
> Add Wa_1607983814 as a context indirect workaround.

Copy and paste blunder, that was suppose to be 18022495364!

Regards,

Tvrtko

> 
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin at igalia.com>
> ---
>   drivers/gpu/drm/xe/regs/xe_engine_regs.h |  3 +++
>   drivers/gpu/drm/xe/xe_lrc.c              | 12 ++++++++++++
>   drivers/gpu/drm/xe/xe_wa_oob.rules       |  1 +
>   3 files changed, 16 insertions(+)
> 
> diff --git a/drivers/gpu/drm/xe/regs/xe_engine_regs.h b/drivers/gpu/drm/xe/regs/xe_engine_regs.h
> index d1d2592e010d..94d778d5425d 100644
> --- a/drivers/gpu/drm/xe/regs/xe_engine_regs.h
> +++ b/drivers/gpu/drm/xe/regs/xe_engine_regs.h
> @@ -112,6 +112,9 @@
>   #define   PPHWSP_CSB_AND_TIMESTAMP_REPORT_DIS	REG_BIT(14)
>   #define   CS_PRIORITY_MEM_READ			REG_BIT(7)
>   
> +#define CS_DEBUG_MODE2(base)			XE_REG((base) + 0xd8, XE_REG_OPTION_MASKED)
> +#define   INSTRUCTION_STATE_CACHE_INVALIDATE	REG_BIT(6)
> +
>   #define FF_SLICE_CS_CHICKEN1(base)		XE_REG((base) + 0xe0, XE_REG_OPTION_MASKED)
>   #define   FFSC_PERCTX_PREEMPT_CTRL		REG_BIT(14)
>   
> diff --git a/drivers/gpu/drm/xe/xe_lrc.c b/drivers/gpu/drm/xe/xe_lrc.c
> index 6022068ce6b6..d729d79ae802 100644
> --- a/drivers/gpu/drm/xe/xe_lrc.c
> +++ b/drivers/gpu/drm/xe/xe_lrc.c
> @@ -1028,6 +1028,15 @@ xelp_emit_cmd_buf_wa(struct xe_lrc *lrc, u32 *cmd)
>   	return cmd;
>   }
>   
> +static u32 *xelp_invalidate_state_cache(u32 *cmd)
> +{
> +	*cmd++ = MI_LOAD_REGISTER_IMM | MI_LRI_NUM_REGS(1);
> +	*cmd++ = CS_DEBUG_MODE1(0).addr;
> +	*cmd++ = _MASKED_BIT_ENABLE(INSTRUCTION_STATE_CACHE_INVALIDATE);
> +
> +	return cmd;
> +}
> +
>   static u32 *
>   xelp_setup_indirect_ctx_rcs(struct xe_lrc *lrc, struct xe_hw_engine *hwe,
>   			    u32 *cmd)
> @@ -1037,6 +1046,9 @@ xelp_setup_indirect_ctx_rcs(struct xe_lrc *lrc, struct xe_hw_engine *hwe,
>   	cmd = xelp_emit_cmd_buf_wa(lrc, cmd);
>   	cmd = xelp_emit_restore_scratch(lrc, cmd);
>   
> +	if (XE_WA(lrc->gt, 1607983814))
> +		cmd = xelp_invalidate_state_cache(cmd);
> +
>   	return cmd;
>   }
>   
> diff --git a/drivers/gpu/drm/xe/xe_wa_oob.rules b/drivers/gpu/drm/xe/xe_wa_oob.rules
> index 9efc5accd43d..a32f5ee9e917 100644
> --- a/drivers/gpu/drm/xe/xe_wa_oob.rules
> +++ b/drivers/gpu/drm/xe/xe_wa_oob.rules
> @@ -1,4 +1,5 @@
>   1607983814	GRAPHICS_VERSION_RANGE(1200, 1210)
> +18022495364	GRAPHICS_VERSION_RANGE(1200, 1210)
>   22012773006	GRAPHICS_VERSION_RANGE(1200, 1250)
>   14014475959	GRAPHICS_VERSION_RANGE(1270, 1271), GRAPHICS_STEP(A0, B0)
>   		PLATFORM(DG2)