[Intel-xe] [PATCH] Revert "drm/xe: Allocate regset space for Wa_1607983814 unconditionally"

[Souza, Jose]

On Wed, 2023-03-22 at 16:57 +0000, Matthew Auld wrote:
> This reverts commit d51afeaae0479c964e720f3855834a82914112f6.
> 
> See if this helps the ADL-P in CI.
> 
> Signed-off-by: Matthew Auld <matthew.auld at intel.com>
> ---
>  drivers/gpu/drm/xe/xe_guc_ads.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_guc_ads.c b/drivers/gpu/drm/xe/xe_guc_ads.c
> index 304a9501b447..fd9911ffeae4 100644
> --- a/drivers/gpu/drm/xe/xe_guc_ads.c
> +++ b/drivers/gpu/drm/xe/xe_guc_ads.c
> @@ -224,7 +224,10 @@ static size_t calculate_regset_size(struct xe_gt *gt)
>  		xa_for_each(&hwe->reg_sr.xa, sr_idx, sr_entry)
>  			count++;
>  
> -	count += (ADS_REGSET_EXTRA_MAX + LNCFCMOCS_REG_COUNT) * XE_NUM_HW_ENGINES;
> +	count += ADS_REGSET_EXTRA_MAX * XE_NUM_HW_ENGINES;
> +
> +	if (needs_wa_1607983814(gt_to_xe(gt)))
> +		count += LNCFCMOCS_REG_COUNT;

needs_wa_1607983814() also applies to ADL-P, so it should not flip adlp-p results.

I guess the problem is the calculation:
(ADS_REGSET_EXTRA_MAX * XE_NUM_HW_ENGINES) + LNCFCMOCS_REG_COUNT != (ADS_REGSET_EXTRA_MAX + LNCFCMOCS_REG_COUNT) * XE_NUM_HW_ENGINES.

Did not checked what is correct for the workaround implementation.

>  
>  	return count * sizeof(struct guc_mmio_reg);
>  }