Re: [PATCH] drm/xe/xe3p_lpg: Add support for Wa_16030224309

[Gustavo Sousa <gustavo.sousa@intel.com>]

<tilak.tirumalesh.tangudu@intel.com> writes:

> From: Tangudu Tilak Tirumalesh <tilak.tirumalesh.tangudu@intel.com>
>
> Opt in to the GuC workaround, to ignore context completion status
> with preemption or preemption-to-idle in the CSB when the multi-queue
> feature is enabled, which is supported on Graphics Version 35.10.
> This WA is supported starting from GuC 70.73.
>
> Apply Wa_16030224309 to Graphics Version 35.10.
>
> Signed-off-by: Tangudu Tilak Tirumalesh <tilak.tirumalesh.tangudu@intel.com>
> ---

Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com>

>  drivers/gpu/drm/xe/abi/guc_klvs_abi.h | 1 +
>  drivers/gpu/drm/xe/xe_guc_ads.c       | 6 ++++++
>  drivers/gpu/drm/xe/xe_wa_oob.rules    | 1 +
>  3 files changed, 8 insertions(+)
>
> diff --git a/drivers/gpu/drm/xe/abi/guc_klvs_abi.h b/drivers/gpu/drm/xe/abi/guc_klvs_abi.h
> index 685c4ef17b73..4bcdc1a96785 100644
> --- a/drivers/gpu/drm/xe/abi/guc_klvs_abi.h
> +++ b/drivers/gpu/drm/xe/abi/guc_klvs_abi.h
> @@ -525,6 +525,7 @@ enum xe_guc_klv_ids {
>  	GUC_WA_KLV_CLR_CS_INDIRECT_RING_STATE_IF_IDLE_AT_CTX_REG			= 0x900e,
>  	GUC_WA_KLV_REMAP_RANGED_TLB_INV							= 0x900f,
>  	GUC_WA_KLV_IGNORE_MMIO_READ_SEM_TOKEN_64					= 0x9010,
> +	GUC_WA_KLV_IGNORE_MULTIQ_CTX_COMPLETE_WITH_PREEMPT_IN_CSB			= 0x9011,
>  };
>  
>  /**
> diff --git a/drivers/gpu/drm/xe/xe_guc_ads.c b/drivers/gpu/drm/xe/xe_guc_ads.c
> index ff8eee3831aa..70babe95a6aa 100644
> --- a/drivers/gpu/drm/xe/xe_guc_ads.c
> +++ b/drivers/gpu/drm/xe/xe_guc_ads.c
> @@ -396,6 +396,12 @@ static void guc_waklv_init(struct xe_guc_ads *ads)
>  				 GUC_FEATURE_KLV_DISABLE_MULTI_QUEUE);
>  	}
>  
> +	/* GuC only applies this WA for scheduled MultiQ contexts; no KMD-side gating needed. */
> +	if (XE_GT_WA(gt, 16030224309) &&
> +	    GUC_FIRMWARE_VER_AT_LEAST(&gt->uc.guc, 70, 73))
> +		guc_waklv_enable(ads, NULL, 0, &offset, &remain,
> +				 GUC_WA_KLV_IGNORE_MULTIQ_CTX_COMPLETE_WITH_PREEMPT_IN_CSB);
> +
>  	size = guc_ads_waklv_size(ads) - remain;
>  	if (!size)
>  		return;
> diff --git a/drivers/gpu/drm/xe/xe_wa_oob.rules b/drivers/gpu/drm/xe/xe_wa_oob.rules
> index dd69ad07f7a9..d06ee78bf534 100644
> --- a/drivers/gpu/drm/xe/xe_wa_oob.rules
> +++ b/drivers/gpu/drm/xe/xe_wa_oob.rules
> @@ -72,3 +72,4 @@
>  16029897822	MEDIA_VERSION(3500)
>  		GRAPHICS_VERSION(3510)
>  14027054324	GRAPHICS_VERSION(3511)
> +16030224309	GRAPHICS_VERSION(3510)
> -- 
> 2.46.0