[Intel-xe] [PATCH v4 18/21] drm/xe/guc: Port Wa_16015675438/Wa_18020744125 to xe_wa

[Matt Roper]

On Thu, May 25, 2023 at 02:34:04PM -0700, Lucas De Marchi wrote:
> Wa_16015675438 and Wa_18020744125 apply to DG2 using the same action and
> conditions. Add both to the oob rules so they are both reported as
> active. Note that previously they were not checking by platform or IP
> version, hence making them not future-proof.  Those workarounds should
> only be active in PVC and DG2, besides the check for "no render engine".
> 
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
> ---
>  drivers/gpu/drm/xe/xe_guc.c        | 4 ++--
>  drivers/gpu/drm/xe/xe_wa_oob.rules | 3 +++
>  2 files changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_guc.c b/drivers/gpu/drm/xe/xe_guc.c
> index 1291f71348db..cc58a2092236 100644
> --- a/drivers/gpu/drm/xe/xe_guc.c
> +++ b/drivers/gpu/drm/xe/xe_guc.c
> @@ -164,8 +164,8 @@ static u32 guc_ctl_wa_flags(struct xe_guc *guc)
>  	if (XE_WA(gt, 22012727170) || XE_WA(gt, 22012727685))
>  		flags |= GUC_WA_CONTEXT_ISOLATION;
>  
> -	/* Wa_16015675438, Wa_18020744125 */
> -	if (!xe_hw_engine_mask_per_class(gt, XE_ENGINE_CLASS_RENDER))
> +	if ((XE_WA(gt, 16015675438) || XE_WA(gt, 18020744125)) &&
> +	    !xe_hw_engine_mask_per_class(gt, XE_ENGINE_CLASS_RENDER))
>  		flags |= GUC_WA_RCS_REGS_IN_CCS_REGS_LIST;
>  
>  	/* Wa_1509372804 */
> diff --git a/drivers/gpu/drm/xe/xe_wa_oob.rules b/drivers/gpu/drm/xe/xe_wa_oob.rules
> index fecf9dd431c5..05c821a50680 100644
> --- a/drivers/gpu/drm/xe/xe_wa_oob.rules
> +++ b/drivers/gpu/drm/xe/xe_wa_oob.rules
> @@ -8,3 +8,6 @@
>  		SUBPLATFORM(DG2, G11), GRAPHICS_STEP(A0, FOREVER)
>  22012727685	SUBPLATFORM(DG2, G10), GRAPHICS_STEP(A0, C0)
>  		SUBPLATFORM(DG2, G11), GRAPHICS_STEP(A0, FOREVER)
> +16015675438	PLATFORM(PVC)
> +		PLATFORM(DG2)

I see DG2-G10 and DG2-G12 listed, but not DG2-G11.  Platform-specific
ticket #14016276341 confirms that DG2-G11 should not be impacted.


Matt

> +18020744125	PLATFORM(PVC)
> -- 
> 2.40.1
> 

-- 
Matt Roper
Graphics Software Engineer
Linux GPU Platform Enablement
Intel Corporation