[Intel-xe] [PATCH v4 21/21] drm/xe/guc: Port Wa_14014475959 to xe_wa and fix it

[Matt Roper]

On Thu, May 25, 2023 at 02:34:07PM -0700, Lucas De Marchi wrote:
> Port Wa_14014475959 to xe_wa fixing its condition. The workaround should
> only be applied on the primary GT, not on media. So just checking by
> MTL platform is not enough: checking GT is of the right type is also
> needed.
> 
> Since the GRAPHICS_STEP() does checks the GT type, we could leave the
> first check as a platform one: it'd would be easier to understand and
> not go out of sync with the graphics_ip_map[] in
> drivers/gpu/drm/xe/xe_pci.c. However it also means that new platforms
> using the same IP wouldn't match. Prefer using the IP version.
> 
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>

Reviewed-by: Matt Roper <matthew.d.roper at intel.com>

> ---
>  drivers/gpu/drm/xe/xe_guc.c        | 4 +---
>  drivers/gpu/drm/xe/xe_wa_oob.rules | 2 ++
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_guc.c b/drivers/gpu/drm/xe/xe_guc.c
> index 3ed460d3b6ca..ecc843d91f62 100644
> --- a/drivers/gpu/drm/xe/xe_guc.c
> +++ b/drivers/gpu/drm/xe/xe_guc.c
> @@ -142,9 +142,7 @@ static u32 guc_ctl_wa_flags(struct xe_guc *guc)
>  	if (XE_WA(gt, 16011759253))
>  		flags |= GUC_WA_GAM_CREDITS;
>  
> -	/* Wa_14014475959 */
> -	if (IS_PLATFORM_STEP(xe, XE_METEORLAKE, STEP_A0, STEP_B0) ||
> -	    xe->info.platform == XE_DG2)
> +	if (XE_WA(gt, 14014475959))
>  		flags |= GUC_WA_HOLD_CCS_SWITCHOUT;
>  
>  	if (XE_WA(gt, 22011391025) || XE_WA(gt, 14012197797))
> diff --git a/drivers/gpu/drm/xe/xe_wa_oob.rules b/drivers/gpu/drm/xe/xe_wa_oob.rules
> index fc9846af460c..c58f3eb3e993 100644
> --- a/drivers/gpu/drm/xe/xe_wa_oob.rules
> +++ b/drivers/gpu/drm/xe/xe_wa_oob.rules
> @@ -1,5 +1,7 @@
>  22012773006	GRAPHICS_VERSION_RANGE(1200, 1250)
>  16011759253	SUBPLATFORM(DG2, G10), GRAPHICS_STEP(A0, B0)
> +14014475959	GRAPHICS_VERSION_RANGE(1270, 1271), GRAPHICS_STEP(A0, B0)
> +		PLATFORM(DG2)
>  22011391025	PLATFORM(DG2)
>  14012197797	PLATFORM(DG2), GRAPHICS_STEP(A0, B0)
>  16011777198	SUBPLATFORM(DG2, G10), GRAPHICS_STEP(A0, C0)
> -- 
> 2.40.1
> 

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