Re: [PATCH] drm/xe: Restore GT freq on GSC load error

[Rodrigo Vivi <rodrigo.vivi@intel.com>]

On Wed, Sep 25, 2024 at 01:49:18PM -0700, Vinay Belgaumkar wrote:
> As part of a Wa_22019338487, ensure that GT freq is restored
> even when GSC reload is not successful.
> 
> Fixes: 3b1592fb7835 ("drm/xe/lnl: Apply Wa_22019338487")
> 
> Signed-off-by: Vinay Belgaumkar <vinay.belgaumkar@intel.com>

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

> ---
>  drivers/gpu/drm/xe/xe_gt.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c
> index 796b330ffd62..a5083ffc59f4 100644
> --- a/drivers/gpu/drm/xe/xe_gt.c
> +++ b/drivers/gpu/drm/xe/xe_gt.c
> @@ -908,7 +908,9 @@ int xe_gt_sanitize_freq(struct xe_gt *gt)
>  	int ret = 0;
>  
>  	if ((!xe_uc_fw_is_available(&gt->uc.gsc.fw) ||
> -	     xe_uc_fw_is_loaded(&gt->uc.gsc.fw)) && XE_WA(gt, 22019338487))
> +	     xe_uc_fw_is_loaded(&gt->uc.gsc.fw) ||
> +	     xe_uc_fw_is_in_error_state(&gt->uc.gsc.fw)) &&
> +	    XE_WA(gt, 22019338487))
>  		ret = xe_guc_pc_restore_stashed_freq(&gt->uc.guc.pc);
>  
>  	return ret;
> -- 
> 2.38.1
>