[PATCH v2 09/14] drm/xe: Move oa fini to xe_oa

[Dixit, Ashutosh]

On Thu, 06 Feb 2025 15:23:27 -0800, Lucas De Marchi wrote:
>
> Like done with other functions, cleanup the error handling in
> xe_device_probe() by moving the OA fini to be handled by xe_oa.

Maybe just mention devm cleanup here in the commit message as the reason
for this patch. Otherwise, lgtm:

Reviewed-by: Ashutosh Dixit <ashutosh.dixit at intel.com>

> Cc: Ashutosh Dixit <ashutosh.dixit at intel.com>
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
> ---
>  drivers/gpu/drm/xe/xe_device.c |  7 +----
>  drivers/gpu/drm/xe/xe_oa.c     | 48 +++++++++++++++++-----------------
>  drivers/gpu/drm/xe/xe_oa.h     |  1 -
>  3 files changed, 25 insertions(+), 31 deletions(-)
>
> diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
> index 09288558e4e44..944a40a1e0174 100644
> --- a/drivers/gpu/drm/xe/xe_device.c
> +++ b/drivers/gpu/drm/xe/xe_device.c
> @@ -867,7 +867,7 @@ int xe_device_probe(struct xe_device *xe)
>
>	err = xe_display_init(xe);
>	if (err)
> -		goto err_fini_oa;
> +		return err;
>
>	err = xe_pxp_init(xe);
>	if (err)
> @@ -899,9 +899,6 @@ int xe_device_probe(struct xe_device *xe)
>  err_fini_display:
>	xe_display_driver_remove(xe);
>
> -err_fini_oa:
> -	xe_oa_fini(xe);
> -
>	return err;
>  }
>
> @@ -971,8 +968,6 @@ void xe_device_remove(struct xe_device *xe)
>
>	xe_device_remove_display(xe);
>
> -	xe_oa_fini(xe);
> -
>	xe_heci_gsc_fini(xe);
>
>	xe_device_call_remove_actions(xe);
> diff --git a/drivers/gpu/drm/xe/xe_oa.c b/drivers/gpu/drm/xe/xe_oa.c
> index fa873f3d0a9d1..2c640185bdeca 100644
> --- a/drivers/gpu/drm/xe/xe_oa.c
> +++ b/drivers/gpu/drm/xe/xe_oa.c
> @@ -2641,6 +2641,27 @@ static void xe_oa_init_supported_formats(struct xe_oa *oa)
>	}
>  }
>
> +static int destroy_config(int id, void *p, void *data)
> +{
> +	xe_oa_config_put(p);
> +
> +	return 0;
> +}
> +
> +static void xe_oa_fini(void *arg)
> +{
> +	struct xe_device *xe = arg;
> +	struct xe_oa *oa = &xe->oa;
> +
> +	if (!oa->xe)
> +		return;
> +
> +	idr_for_each(&oa->metrics_idr, destroy_config, oa);
> +	idr_destroy(&oa->metrics_idr);
> +
> +	oa->xe = NULL;
> +}
> +
>  /**
>   * xe_oa_init - OA initialization during device probe
>   * @xe: @xe_device
> @@ -2672,31 +2693,10 @@ int xe_oa_init(struct xe_device *xe)
>	}
>
>	xe_oa_init_supported_formats(oa);
> -	return 0;
> -exit:
> -	oa->xe = NULL;
> -	return ret;
> -}
>
> -static int destroy_config(int id, void *p, void *data)
> -{
> -	xe_oa_config_put(p);
> -	return 0;
> -}
> -
> -/**
> - * xe_oa_fini - OA de-initialization during device remove
> - * @xe: @xe_device
> - */
> -void xe_oa_fini(struct xe_device *xe)
> -{
> -	struct xe_oa *oa = &xe->oa;
> -
> -	if (!oa->xe)
> -		return;
> -
> -	idr_for_each(&oa->metrics_idr, destroy_config, oa);
> -	idr_destroy(&oa->metrics_idr);
> +	return devm_add_action_or_reset(xe->drm.dev, xe_oa_fini, xe);
>
> +exit:
>	oa->xe = NULL;
> +	return ret;
>  }
> diff --git a/drivers/gpu/drm/xe/xe_oa.h b/drivers/gpu/drm/xe/xe_oa.h
> index 87a38820c317d..eb36ce250c615 100644
> --- a/drivers/gpu/drm/xe/xe_oa.h
> +++ b/drivers/gpu/drm/xe/xe_oa.h
> @@ -15,7 +15,6 @@ struct xe_gt;
>  struct xe_hw_engine;
>
>  int xe_oa_init(struct xe_device *xe);
> -void xe_oa_fini(struct xe_device *xe);
>  void xe_oa_register(struct xe_device *xe);
>  void xe_oa_unregister(struct xe_device *xe);
>  int xe_oa_stream_open_ioctl(struct drm_device *dev, u64 data, struct drm_file *file);
> --
> 2.48.1
>