[PATCH v2 5/8] drm/i915/reset: add wrappers for display reset calls

[Matt Roper]

On Tue, Feb 25, 2025 at 01:14:19PM +0200, Jani Nikula wrote:
> More of the gt side of display reset will be moved away from
> display. Add small wrappers for display reset calls to not clutter the
> gt reset part of things.
> 
> Cc: Matt Roper <matthew.d.roper at intel.com>
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>

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

> ---
>  drivers/gpu/drm/i915/gt/intel_reset.c | 23 ++++++++++++++++++-----
>  1 file changed, 18 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c
> index 835c9081b239..d424ffb43aa7 100644
> --- a/drivers/gpu/drm/i915/gt/intel_reset.c
> +++ b/drivers/gpu/drm/i915/gt/intel_reset.c
> @@ -1400,6 +1400,22 @@ int intel_engine_reset(struct intel_engine_cs *engine, const char *msg)
>  	return err;
>  }
>  
> +static void display_reset_prepare(struct intel_gt *gt)
> +{
> +	struct drm_i915_private *i915 = gt->i915;
> +	struct intel_display *display = &i915->display;
> +
> +	intel_display_reset_prepare(display);
> +}
> +
> +static void display_reset_finish(struct intel_gt *gt)
> +{
> +	struct drm_i915_private *i915 = gt->i915;
> +	struct intel_display *display = &i915->display;
> +
> +	intel_display_reset_finish(display);
> +}
> +
>  static void intel_gt_reset_global(struct intel_gt *gt,
>  				  u32 engine_mask,
>  				  const char *reason)
> @@ -1417,14 +1433,11 @@ static void intel_gt_reset_global(struct intel_gt *gt,
>  
>  	/* Use a watchdog to ensure that our reset completes */
>  	intel_wedge_on_timeout(&w, gt, 60 * HZ) {
> -		struct drm_i915_private *i915 = gt->i915;
> -		struct intel_display *display = &i915->display;
> -
> -		intel_display_reset_prepare(display);
> +		display_reset_prepare(gt);
>  
>  		intel_gt_reset(gt, engine_mask, reason);
>  
> -		intel_display_reset_finish(display);
> +		display_reset_finish(gt);
>  	}
>  
>  	if (!test_bit(I915_WEDGED, &gt->reset.flags))
> -- 
> 2.39.5
> 

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