Re: [PATCH v9 6/7] drm/xe/uc: Drop xe_guc_sanitize in favor of managed cleanup

[Matthew Brost <matthew.brost@intel.com>]

On Tue, Mar 10, 2026 at 06:50:38PM -0400, Zhanjun Dong wrote:
> If the firmware fails to load in GT resets the device is wedged also
> initiating a GuC state cleanup.
> 
> Signed-off-by: Zhanjun Dong <zhanjun.dong@intel.com>

Reviewed-by: Matthew Brost <matthew.brost@intel.com>

> ---
>  drivers/gpu/drm/xe/xe_uc.c | 22 +++++++---------------
>  1 file changed, 7 insertions(+), 15 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_uc.c b/drivers/gpu/drm/xe/xe_uc.c
> index d9aa845a308d..75091bde0d50 100644
> --- a/drivers/gpu/drm/xe/xe_uc.c
> +++ b/drivers/gpu/drm/xe/xe_uc.c
> @@ -157,23 +157,19 @@ static int vf_uc_load_hw(struct xe_uc *uc)
>  
>  	err = xe_gt_sriov_vf_connect(uc_to_gt(uc));
>  	if (err)
> -		goto err_out;
> +		return err;
>  
>  	uc->guc.submission_state.enabled = true;
>  
>  	err = xe_guc_opt_in_features_enable(&uc->guc);
>  	if (err)
> -		goto err_out;
> +		return err;
>  
>  	err = xe_gt_record_default_lrcs(uc_to_gt(uc));
>  	if (err)
> -		goto err_out;
> +		return err;
>  
>  	return 0;
> -
> -err_out:
> -	xe_guc_sanitize(&uc->guc);
> -	return err;
>  }
>  
>  /*
> @@ -205,19 +201,19 @@ int xe_uc_load_hw(struct xe_uc *uc)
>  
>  	ret = xe_gt_record_default_lrcs(uc_to_gt(uc));
>  	if (ret)
> -		goto err_out;
> +		return ret;
>  
>  	ret = xe_guc_post_load_init(&uc->guc);
>  	if (ret)
> -		goto err_out;
> +		return ret;
>  
>  	ret = xe_guc_pc_start(&uc->guc.pc);
>  	if (ret)
> -		goto err_out;
> +		return ret;
>  
>  	ret = xe_guc_rc_enable(&uc->guc);
>  	if (ret)
> -		goto err_out;
> +		return ret;
>  
>  	xe_guc_engine_activity_enable_stats(&uc->guc);
>  
> @@ -232,10 +228,6 @@ int xe_uc_load_hw(struct xe_uc *uc)
>  	xe_gsc_load_start(&uc->gsc);
>  
>  	return 0;
> -
> -err_out:
> -	xe_guc_sanitize(&uc->guc);
> -	return ret;
>  }
>  
>  int xe_uc_reset_prepare(struct xe_uc *uc)
> -- 
> 2.34.1
>