Re: [PATCH 08/12] drm/xe: Extract xe_hw_engines_setup_runtime_mask()

[Matt Roper <matthew.d.roper@intel.com>]

On Fri, Jan 16, 2026 at 07:12:16PM -0300, Gustavo Sousa wrote:
> The function xe_hw_engines_init_early() does several runtime checks to
> adjust engine_mask and only after that does the hw_engine_init_early()
> calls to do the early initialization.
> 
> In an upcoming change to xe_wa_test.c, we will want to be able to call
> that function without those runtime checks.  So, let's extract them into
> a new function called xe_hw_engines_setup_runtime_mask() and have the
> current caller of xe_hw_engines_init_early() to call it first.
> 
> Signed-off-by: Gustavo Sousa <gustavo.sousa@intel.com>

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

> ---
>  drivers/gpu/drm/xe/xe_gt.c        | 2 ++
>  drivers/gpu/drm/xe/xe_hw_engine.c | 9 ++++++---
>  drivers/gpu/drm/xe/xe_hw_engine.h | 1 +
>  3 files changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c
> index 68cd26286956..f7f0c048a00a 100644
> --- a/drivers/gpu/drm/xe/xe_gt.c
> +++ b/drivers/gpu/drm/xe/xe_gt.c
> @@ -507,6 +507,8 @@ static int gt_init_with_gt_forcewake(struct xe_gt *gt)
>  	/* Rerun MCR init as we now have hw engine list */
>  	xe_gt_mcr_init(gt);
>  
> +	xe_hw_engines_setup_runtime_mask(gt);
> +
>  	err = xe_hw_engines_init_early(gt);
>  	if (err) {
>  		dump_pat_on_error(gt);
> diff --git a/drivers/gpu/drm/xe/xe_hw_engine.c b/drivers/gpu/drm/xe/xe_hw_engine.c
> index 8d239291bc7b..c2de6e5d9249 100644
> --- a/drivers/gpu/drm/xe/xe_hw_engine.c
> +++ b/drivers/gpu/drm/xe/xe_hw_engine.c
> @@ -868,15 +868,18 @@ static void check_sw_disable(struct xe_gt *gt)
>  	}
>  }
>  
> -int xe_hw_engines_init_early(struct xe_gt *gt)
> +void xe_hw_engines_setup_runtime_mask(struct xe_gt *gt)
>  {
> -	int i;
> -
>  	read_media_fuses(gt);
>  	read_copy_fuses(gt);
>  	read_compute_fuses(gt);
>  	check_gsc_availability(gt);
>  	check_sw_disable(gt);
> +}
> +
> +int xe_hw_engines_init_early(struct xe_gt *gt)
> +{
> +	int i;
>  
>  	BUILD_BUG_ON(XE_HW_ENGINE_PREEMPT_TIMEOUT < XE_HW_ENGINE_PREEMPT_TIMEOUT_MIN);
>  	BUILD_BUG_ON(XE_HW_ENGINE_PREEMPT_TIMEOUT > XE_HW_ENGINE_PREEMPT_TIMEOUT_MAX);
> diff --git a/drivers/gpu/drm/xe/xe_hw_engine.h b/drivers/gpu/drm/xe/xe_hw_engine.h
> index 7e897620db65..6729ebf0462c 100644
> --- a/drivers/gpu/drm/xe/xe_hw_engine.h
> +++ b/drivers/gpu/drm/xe/xe_hw_engine.h
> @@ -49,6 +49,7 @@ struct xe_exec_queue;
>  #define XE_HW_ENGINE_PREEMPT_TIMEOUT_MAX (10 * 1000 * 1000)
>  #endif
>  
> +void xe_hw_engines_setup_runtime_mask(struct xe_gt *gt);
>  int xe_hw_engines_init_early(struct xe_gt *gt);
>  int xe_hw_engines_init(struct xe_gt *gt);
>  void xe_hw_engine_handle_irq(struct xe_hw_engine *hwe, u16 intr_vec);
> 
> -- 
> 2.52.0
> 

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