[PATCH] drm/xe: Check return values of functions in xe_gt_shutdown()

Maarten Lankhorst maarten.lankhorst at linux.intel.com
Thu Sep 26 11:11:22 UTC 2024


Hey,

Den 2024-09-26 kl. 13:00, skrev apoorva.singh at intel.com:
> From: Apoorva Singh <apoorva.singh at intel.com>
> 
> Check the return values of the functions xe_force_wake_get()
> and xe_force_wake_put() to prevent mistakenly treating them as
> void returns.
> 
> Cc: Himal Prasad Ghimiray <himal.prasad.ghimiray at intel.com>
> Signed-off-by: Apoorva Singh <apoorva.singh at intel.com>
> Reviewed-by: Himal Prasad Ghimiray <himal.prasad.ghimiray at intel.com>
> ---
>  drivers/gpu/drm/xe/xe_gt.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c
> index 274737417b0f..317640554310 100644
> --- a/drivers/gpu/drm/xe/xe_gt.c
> +++ b/drivers/gpu/drm/xe/xe_gt.c
> @@ -890,9 +890,12 @@ int xe_gt_suspend(struct xe_gt *gt)
>  
>  void xe_gt_shutdown(struct xe_gt *gt)
>  {
> -	xe_force_wake_get(gt_to_fw(gt), XE_FORCEWAKE_ALL);
> +	int err;
> +	err = xe_force_wake_get(gt_to_fw(gt), XE_FORCEWAKE_ALL);
> +	xe_gt_WARN(gt, err, "Acknowledgment for domain awake timedout");
>  	do_gt_reset(gt);
> -	xe_force_wake_put(gt_to_fw(gt), XE_FORCEWAKE_ALL);
> +	err = xe_force_wake_put(gt_to_fw(gt), XE_FORCEWAKE_ALL);
> +	xe_gt_WARN(gt, err, "Acknowledgment for domain sleep timedout");
>  }

There's absolutely nothing we can do with xe_force_wake_put, the only thing you can do here is:

int ret = xe_force_wake_get(..);
do_gt_reset;
if (!ret)
xe_force_wake_put

Also no point in complaining, the hardware may already be hosed. :)

I believe that xe_force_wake_put should return void, there's nothing we can do except log the error here.

Cheers,
Maarten


More information about the Intel-xe mailing list