[PATCH 1/7] drm/xe: Fix xe_display_fini() calls

[Rodrigo Vivi]

On Fri, Jan 31, 2025 at 02:31:34PM -0800, Lucas De Marchi wrote:
> xe_display_fini() undoes things from xe_display_init() (technically from
> intel_display_driver_probe()). Those `goto err` in xe_device_probe()
> were wrong and being accumulated over time.
> 
> Commit 65e366ace5ee ("drm/xe/display: Use a single early init call for
> display") made it easier to fix now that we don't have xe_display_* init
> calls spread on xe_device_probe(). Change xe_display_init() to use
> devm_add_action_or_reset() that will finalize display in the right
> order.
> 
> While at it, also add a newline and comment about calling
> xe_driver_flr_fini.

Reviewed-by: Rodrigo Vivi <rodrigo.vivi at intel.com>

> 
> Cc: Maarten Lankhorst <dev at lankhorst.se>
> Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
> ---
>  drivers/gpu/drm/xe/display/xe_display.c | 22 ++++++++++++----------
>  drivers/gpu/drm/xe/display/xe_display.h |  2 --
>  drivers/gpu/drm/xe/xe_device.c          | 19 ++++++++++---------
>  3 files changed, 22 insertions(+), 21 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
> index 651799c946ace..302f533af037d 100644
> --- a/drivers/gpu/drm/xe/display/xe_display.c
> +++ b/drivers/gpu/drm/xe/display/xe_display.c
> @@ -161,27 +161,29 @@ int xe_display_init_early(struct xe_device *xe)
>  	return err;
>  }
>  
> -int xe_display_init(struct xe_device *xe)
> +static void xe_display_fini(void *arg)
>  {
> +	struct xe_device *xe = arg;
>  	struct intel_display *display = &xe->display;
>  
> -	if (!xe->info.probe_display)
> -		return 0;
> -
> -	return intel_display_driver_probe(display);
> +	intel_hpd_poll_fini(xe);
> +	intel_hdcp_component_fini(display);
> +	intel_audio_deinit(display);
>  }
>  
> -void xe_display_fini(struct xe_device *xe)
> +int xe_display_init(struct xe_device *xe)
>  {
>  	struct intel_display *display = &xe->display;
> +	int err;
>  
>  	if (!xe->info.probe_display)
> -		return;
> +		return 0;
>  
> -	intel_hpd_poll_fini(xe);
> +	err = intel_display_driver_probe(display);
> +	if (err)
> +		return err;
>  
> -	intel_hdcp_component_fini(display);
> -	intel_audio_deinit(display);
> +	return devm_add_action_or_reset(xe->drm.dev, xe_display_fini, xe);
>  }
>  
>  void xe_display_register(struct xe_device *xe)
> diff --git a/drivers/gpu/drm/xe/display/xe_display.h b/drivers/gpu/drm/xe/display/xe_display.h
> index e2a99624f7064..685dc74402fb8 100644
> --- a/drivers/gpu/drm/xe/display/xe_display.h
> +++ b/drivers/gpu/drm/xe/display/xe_display.h
> @@ -22,7 +22,6 @@ int xe_display_probe(struct xe_device *xe);
>  
>  int xe_display_init_early(struct xe_device *xe);
>  int xe_display_init(struct xe_device *xe);
> -void xe_display_fini(struct xe_device *xe);
>  
>  void xe_display_register(struct xe_device *xe);
>  void xe_display_unregister(struct xe_device *xe);
> @@ -54,7 +53,6 @@ static inline int xe_display_probe(struct xe_device *xe) { return 0; }
>  
>  static inline int xe_display_init_early(struct xe_device *xe) { return 0; }
>  static inline int xe_display_init(struct xe_device *xe) { return 0; }
> -static inline void xe_display_fini(struct xe_device *xe) {}
>  
>  static inline void xe_display_register(struct xe_device *xe) {}
>  static inline void xe_display_unregister(struct xe_device *xe) {}
> diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
> index 8a2763e8a6e27..589bbe21c32b4 100644
> --- a/drivers/gpu/drm/xe/xe_device.c
> +++ b/drivers/gpu/drm/xe/xe_device.c
> @@ -734,6 +734,7 @@ static int probe_has_flat_ccs(struct xe_device *xe)
>  			"Flat CCS has been disabled in bios, May lead to performance impact");
>  
>  	xe_force_wake_put(gt_to_fw(gt), fw_ref);
> +
>  	return 0;
>  }
>  
> @@ -802,22 +803,26 @@ int xe_device_probe(struct xe_device *xe)
>  	err = xe_devcoredump_init(xe);
>  	if (err)
>  		return err;
> +
> +	/*
> +	 * From here on, if a step fails, make sure a Driver-FLR is triggereed
> +	 */
>  	err = devm_add_action_or_reset(xe->drm.dev, xe_driver_flr_fini, xe);
>  	if (err)
>  		return err;
>  
>  	err = probe_has_flat_ccs(xe);
>  	if (err)
> -		goto err;
> +		return err;
>  
>  	err = xe_vram_probe(xe);
>  	if (err)
> -		goto err;
> +		return err;
>  
>  	for_each_tile(tile, xe, id) {
>  		err = xe_tile_init_noalloc(tile);
>  		if (err)
> -			goto err;
> +			return err;
>  	}
>  
>  	/* Allocate and map stolen after potential VRAM resize */
> @@ -831,12 +836,12 @@ int xe_device_probe(struct xe_device *xe)
>  	 */
>  	err = xe_display_init_early(xe);
>  	if (err)
> -		goto err;
> +		return err;
>  
>  	for_each_tile(tile, xe, id) {
>  		err = xe_tile_init(tile);
>  		if (err)
> -			goto err;
> +			return err;
>  	}
>  
>  	err = xe_irq_install(xe);
> @@ -896,8 +901,6 @@ int xe_device_probe(struct xe_device *xe)
>  			break;
>  	}
>  
> -err:
> -	xe_display_fini(xe);
>  	return err;
>  }
>  
> @@ -918,8 +921,6 @@ void xe_device_remove(struct xe_device *xe)
>  
>  	xe_device_remove_display(xe);
>  
> -	xe_display_fini(xe);
> -
>  	xe_oa_fini(xe);
>  
>  	xe_heci_gsc_fini(xe);
> -- 
> 2.48.0
>