[PATCH 18/20] drm/xe/display: move display fini stuff to devm

[Andrzej Hajda]

On 10.05.2024 20:12, Matthew Auld wrote:
> Match the i915 display handling here with calling both no_irq and
> noaccel when removing the device.
> 
> Signed-off-by: Matthew Auld <matthew.auld at intel.com>
> Cc: Andrzej Hajda <andrzej.hajda at intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>

Reviewed-by: Andrzej Hajda <andrzej.hajda at intel.com>

Regards
Andrzej
> ---
>   drivers/gpu/drm/xe/display/xe_display.c | 12 ++++++------
>   1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
> index 0de0566e5b39..6d74c9f55b0a 100644
> --- a/drivers/gpu/drm/xe/display/xe_display.c
> +++ b/drivers/gpu/drm/xe/display/xe_display.c
> @@ -126,9 +126,9 @@ int xe_display_init_nommio(struct xe_device *xe)
>   	return drmm_add_action_or_reset(&xe->drm, xe_display_fini_nommio, xe);
>   }
>   
> -static void xe_display_fini_noirq(struct drm_device *dev, void *dummy)
> +static void xe_display_fini_noirq(void *arg)
>   {
> -	struct xe_device *xe = to_xe_device(dev);
> +	struct xe_device *xe = arg;
>   
>   	if (!xe->info.enable_display)
>   		return;
> @@ -163,12 +163,12 @@ int xe_display_init_noirq(struct xe_device *xe)
>   	if (err)
>   		return err;
>   
> -	return drmm_add_action_or_reset(&xe->drm, xe_display_fini_noirq, NULL);
> +	return devm_add_action_or_reset(xe->drm.dev, xe_display_fini_noirq, xe);
>   }
>   
> -static void xe_display_fini_noaccel(struct drm_device *dev, void *dummy)
> +static void xe_display_fini_noaccel(void *arg)
>   {
> -	struct xe_device *xe = to_xe_device(dev);
> +	struct xe_device *xe = arg;
>   
>   	if (!xe->info.enable_display)
>   		return;
> @@ -187,7 +187,7 @@ int xe_display_init_noaccel(struct xe_device *xe)
>   	if (err)
>   		return err;
>   
> -	return drmm_add_action_or_reset(&xe->drm, xe_display_fini_noaccel, NULL);
> +	return devm_add_action_or_reset(xe->drm.dev, xe_display_fini_noaccel, xe);
>   }
>   
>   int xe_display_init(struct xe_device *xe)