[PATCH 20/20] drm/xe/display: move device_remove over to drmm

[Andrzej Hajda]

On 10.05.2024 20:12, Matthew Auld wrote:
> i915 display calls this when releasing the drm_device, match this also
> in xe by using drmm. intel_display_device_remove() is freeing purely
> software state for the drm_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>
> ---
>   drivers/gpu/drm/xe/display/xe_display.c | 20 ++++++++++++++++----
>   drivers/gpu/drm/xe/display/xe_display.h |  4 ++--
>   drivers/gpu/drm/xe/xe_pci.c             |  4 +++-
>   3 files changed, 21 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
> index 734bddbb8932..ac674a08664d 100644
> --- a/drivers/gpu/drm/xe/display/xe_display.c
> +++ b/drivers/gpu/drm/xe/display/xe_display.c
> @@ -234,8 +234,6 @@ void xe_display_driver_remove(struct xe_device *xe)
>   		return;
>   
>   	intel_display_driver_remove(xe);
> -
> -	intel_display_device_remove(xe);
>   }
>   
>   /* IRQ-related functions */
> @@ -377,17 +375,31 @@ void xe_display_pm_resume(struct xe_device *xe)
>   	intel_power_domains_enable(xe);
>   }
>   
> -void xe_display_probe(struct xe_device *xe)
> +static void display_device_remove(struct drm_device *dev, void *arg)
> +{
> +	struct xe_device *xe = arg;
> +
> +	intel_display_device_remove(xe);
> +}
> +
> +int xe_display_probe(struct xe_device *xe)
>   {
> +	int err;
> +
>   	if (!xe->info.enable_display)
>   		goto no_display;
>   
>   	intel_display_device_probe(xe);
>   
> +	err = drmm_add_action_or_reset(&xe->drm, display_device_remove, xe);
> +	if (err)
> +		return err;
> +
>   	if (has_display(xe))
> -		return;
> +		return 0;
>   
>   no_display:
>   	xe->info.enable_display = false;
>   	unset_display_features(xe);
> +	return 0;
>   }
> diff --git a/drivers/gpu/drm/xe/display/xe_display.h b/drivers/gpu/drm/xe/display/xe_display.h
> index 710e56180b52..148bf7d744e6 100644
> --- a/drivers/gpu/drm/xe/display/xe_display.h
> +++ b/drivers/gpu/drm/xe/display/xe_display.h
> @@ -18,7 +18,7 @@ void xe_display_driver_remove(struct xe_device *xe);
>   
>   int xe_display_create(struct xe_device *xe);
>   
> -void xe_display_probe(struct xe_device *xe);
> +int xe_display_probe(struct xe_device *xe);
>   
>   int xe_display_init_nommio(struct xe_device *xe);
>   int xe_display_init_noirq(struct xe_device *xe);
> @@ -47,7 +47,7 @@ static inline void xe_display_driver_remove(struct xe_device *xe) {}
>   
>   static inline int xe_display_create(struct xe_device *xe) { return 0; }
>   
> -static inline void xe_display_probe(struct xe_device *xe) { }
> +static inline int xe_display_probe(struct xe_device *xe) { }

With added "return 0"
Reviewed-by: Andrzej Hajda <andrzej.hajda at intel.com>

Regards
Andrzej

>   
>   static inline int xe_display_init_nommio(struct xe_device *xe) { return 0; }
>   static inline int xe_display_init_noirq(struct xe_device *xe) { return 0; }
> diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c
> index 841b02ac6ba1..b366cbceb476 100644
> --- a/drivers/gpu/drm/xe/xe_pci.c
> +++ b/drivers/gpu/drm/xe/xe_pci.c
> @@ -768,7 +768,9 @@ static int xe_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
>   	if (err)
>   		return err;
>   
> -	xe_display_probe(xe);
> +	err = xe_display_probe(xe);
> +	if (err)
> +		return err;
>   
>   	drm_dbg(&xe->drm, "%s %s %04x:%04x dgfx:%d gfx:%s (%d.%02d) media:%s (%d.%02d) display:%s dma_m_s:%d tc:%d gscfi:%d",
>   		desc->platform_name,