[Intel-xe] [PATCH v4 14/21] drm/xe/guc: Port Wa_16011759253 to xe_wa

[Lucas De Marchi]

On Thu, May 25, 2023 at 04:17:29PM -0700, Matt Roper wrote:
>On Thu, May 25, 2023 at 02:34:00PM -0700, Lucas De Marchi wrote:
>> Port Wa_16011759253 to oob. Wa_22011383443, that has the same action,
>> doesn't need to be ported as it targets early PVC steppings.
>
>Technically Wa_22011383443 is also targeting early steppings of DG2.
>But we can come back and prune the DG2 pre-production workarounds later;
>this is a correct conversion of the code that already exists today.

when we were porting the workarounds, due to the hw availalble and type
of WAs we'd need, we decided to support early steppings for DG2, but
skip for PVC and MTL.

Agreed we can come back later and remove the early steppings of DG2.

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

thanks
Lucas De Marchi

>
>>
>> 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 | 1 +
>>  2 files changed, 2 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/xe/xe_guc.c b/drivers/gpu/drm/xe/xe_guc.c
>> index 08362db6a886..1b3fbbd74923 100644
>> --- a/drivers/gpu/drm/xe/xe_guc.c
>> +++ b/drivers/gpu/drm/xe/xe_guc.c
>> @@ -139,9 +139,7 @@ static u32 guc_ctl_wa_flags(struct xe_guc *guc)
>>  	if (XE_WA(gt, 22012773006))
>>  		flags |= GUC_WA_POLLCS;
>>
>> -	/* Wa_16011759253 */
>> -	/* Wa_22011383443 */
>> -	if (IS_SUBPLATFORM_STEP(xe, XE_DG2, XE_SUBPLATFORM_DG2_G10, STEP_A0, STEP_B0))
>> +	if (XE_WA(gt, 16011759253))
>>  		flags |= GUC_WA_GAM_CREDITS;
>>
>>  	/* Wa_14014475959 */
>> diff --git a/drivers/gpu/drm/xe/xe_wa_oob.rules b/drivers/gpu/drm/xe/xe_wa_oob.rules
>> index b54f70eeccf4..9b29a0dd0934 100644
>> --- a/drivers/gpu/drm/xe/xe_wa_oob.rules
>> +++ b/drivers/gpu/drm/xe/xe_wa_oob.rules
>> @@ -1 +1,2 @@
>>  22012773006	GRAPHICS_VERSION_RANGE(1200, 1250)
>> +16011759253	SUBPLATFORM(DG2, G10), GRAPHICS_STEP(A0, B0)
>> --
>> 2.40.1
>>
>
>-- 
>Matt Roper
>Graphics Software Engineer
>Linux GPU Platform Enablement
>Intel Corporation