[PATCH 1/2] drm/xe/uc: Reorder post hwconfig uC initialization step

[Matthew Brost]

On Fri, May 10, 2024 at 10:38:09PM +0200, Michal Wajdeczko wrote:
> We want to move the GuC submission initialization to the post
> hwconfig step, but now this step is done too late as migration
> initialization uses exec_queue that would crash due to a unset
> exec_queue_ops. We can easily fix that by small function reorder.
> 
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
> Cc: Matthew Brost <matthew.brost at intel.com>

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

> ---
>  drivers/gpu/drm/xe/xe_gt.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c
> index 36c7b1631fa6..644bccc9bf4e 100644
> --- a/drivers/gpu/drm/xe/xe_gt.c
> +++ b/drivers/gpu/drm/xe/xe_gt.c
> @@ -434,6 +434,10 @@ static int all_fw_domain_init(struct xe_gt *gt)
>  	if (err)
>  		goto err_force_wake;
>  
> +	err = xe_uc_init_post_hwconfig(&gt->uc);
> +	if (err)
> +		goto err_force_wake;
> +
>  	if (!xe_gt_is_media_type(gt)) {
>  		/*
>  		 * USM has its only SA pool to non-block behind user operations
> @@ -460,10 +464,6 @@ static int all_fw_domain_init(struct xe_gt *gt)
>  		}
>  	}
>  
> -	err = xe_uc_init_post_hwconfig(&gt->uc);
> -	if (err)
> -		goto err_force_wake;
> -
>  	err = xe_uc_init_hw(&gt->uc);
>  	if (err)
>  		goto err_force_wake;
> -- 
> 2.43.0
>