[Intel-xe] [PATCH v5 17/21] drm/xe/guc: Port Wa_22012727170/Wa_22012727685 to xe_wa

[Lucas De Marchi]

On Fri, May 26, 2023 at 09:54:52AM -0700, Matt Roper wrote:
>On Fri, May 26, 2023 at 09:43:54AM -0700, Lucas De Marchi wrote:
>> Wa_22012727170 and Wa_22012727685 apply to DG2 using the same action and
>> conditions. Add both to the oob rules so they are both reported as
>> active.
>>
>> Do not Wa_22012727170 to PVC and MTL since only early A* steppings are
>> affected.
>>
>> v2: Remove DG2_G10 from Wa_22012727685 to match current WA database
>>     (Matt Roper)
>>
>> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
>> ---
>>  drivers/gpu/drm/xe/xe_guc.c        | 8 +-------
>>  drivers/gpu/drm/xe/xe_wa_oob.rules | 3 +++
>>  2 files changed, 4 insertions(+), 7 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/xe/xe_guc.c b/drivers/gpu/drm/xe/xe_guc.c
>> index 5eccc4b67381..1291f71348db 100644
>> --- a/drivers/gpu/drm/xe/xe_guc.c
>> +++ b/drivers/gpu/drm/xe/xe_guc.c
>> @@ -161,13 +161,7 @@ static u32 guc_ctl_wa_flags(struct xe_guc *guc)
>>  	if (XE_WA(gt, 16011777198))
>>  		flags |= GUC_WA_RCS_RESET_BEFORE_RC6;
>>
>> -	/*
>> -	 * Wa_22012727170
>> -	 * Wa_22012727685
>> -	 */
>> -	if (IS_SUBPLATFORM_STEP(xe, XE_DG2, XE_SUBPLATFORM_DG2_G10, STEP_A0, STEP_C0) ||
>> -	    IS_SUBPLATFORM_STEP(xe, XE_DG2, XE_SUBPLATFORM_DG2_G11, STEP_A0,
>> -				STEP_FOREVER))
>> +	if (XE_WA(gt, 22012727170) || XE_WA(gt, 22012727685))
>>  		flags |= GUC_WA_CONTEXT_ISOLATION;
>>
>>  	/* Wa_16015675438, Wa_18020744125 */
>> diff --git a/drivers/gpu/drm/xe/xe_wa_oob.rules b/drivers/gpu/drm/xe/xe_wa_oob.rules
>> index 3d4304b7111e..ac3715e215f2 100644
>> --- a/drivers/gpu/drm/xe/xe_wa_oob.rules
>> +++ b/drivers/gpu/drm/xe/xe_wa_oob.rules
>> @@ -4,3 +4,6 @@
>>  14012197797	PLATFORM(DG2), GRAPHICS_STEP(A0, B0)
>>  16011777198	SUBPLATFORM(DG2, G10), GRAPHICS_STEP(A0, C0)
>>  		SUBPLATFORM(DG2, G11), GRAPHICS_STEP(A0, B0)
>> +22012727170	SUBPLATFORM(DG2, G10), GRAPHICS_STEP(A0, C0)
>> +		SUBPLATFORM(DG2, G11), GRAPHICS_STEP(A0, FOREVER)
>
>Can we leave off the GRAPHICS_STEP here?  A0..forever is everything.
>
>> +22012727685	SUBPLATFORM(DG2, G11), GRAPHICS_STEP(A0, FOREVER)
>
>Ditto.

yeah, thanks. I will remove these.

>
>Aside from that,
>
>Reviewed-by: Matt Roper <matthew.d.roper at intel.com>

thanks
Lucas De Marchi

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