[PATCH 1/1] drm/xe/guc: Fix missing topology init

[Matt Roper]

On Tue, Feb 27, 2024 at 08:49:22AM -0800, Zhanjun Dong wrote:
> init_steering_dss need topology dss mask to be init ahead.
> Fixed by moving xe_gt_topology_init ahead of xe_gt_mcr_init
> 
> Signed-off-by: Zhanjun Dong <zhanjun.dong at intel.com>

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

We used to initialize topology before MCR; that must have been
accidentally lost during the recent refactor.  So that means we probably
want:

Fixes: bf8ec3c3e82c ("drm/xe: Initialize GuC earlier during probe")
Cc: Michał Winiarski <michal.winiarski at intel.com>

as well.


Matt

> ---
>  drivers/gpu/drm/xe/xe_gt.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c
> index 45646d3aea2d..85408e7a932b 100644
> --- a/drivers/gpu/drm/xe/xe_gt.c
> +++ b/drivers/gpu/drm/xe/xe_gt.c
> @@ -315,8 +315,6 @@ int xe_gt_init_early(struct xe_gt *gt)
>  	if (err)
>  		return err;
>  
> -	xe_gt_topology_init(gt);
> -
>  	err = xe_force_wake_put(gt_to_fw(gt), XE_FW_GT);
>  	if (err)
>  		return err;
> @@ -503,6 +501,7 @@ int xe_gt_init_hwconfig(struct xe_gt *gt)
>  	if (err)
>  		goto out;
>  
> +	xe_gt_topology_init(gt);
>  	xe_gt_mcr_init(gt);
>  	xe_pat_init(gt);
>  
> -- 
> 2.34.1
> 

-- 
Matt Roper
Graphics Software Engineer
Linux GPU Platform Enablement
Intel Corporation