[PATCH v5 04/12] drm/amdgpu: add helper function amdgpu_ip_block_resume

Christian König christian.koenig at amd.com
Fri Oct 18 11:12:09 UTC 2024


Am 17.10.24 um 18:25 schrieb Sunil Khatri:
> Use the helper function amdgpu_ip_block_resume where
> same checks and calls are repeated.
>
> Signed-off-by: Sunil Khatri <sunil.khatri at amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu.h        |  2 ++
>   drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 17 +++++++++++++++++
>   2 files changed, 19 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> index df57efa019ba..fba10ad44be9 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> @@ -366,6 +366,8 @@ bool amdgpu_device_ip_is_valid(struct amdgpu_device *adev,
>   			      enum amd_ip_block_type block_type);
>   int amdgpu_ip_block_suspend(struct amdgpu_ip_block *ip_block);
>   
> +int amdgpu_ip_block_resume(struct amdgpu_ip_block *ip_block);
> +
>   #define AMDGPU_MAX_IP_NUM 16
>   
>   struct amdgpu_ip_block_status {
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index 2d098c876151..77669eab3511 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -289,6 +289,23 @@ int amdgpu_ip_block_suspend(struct amdgpu_ip_block *ip_block)
>   	return 0;
>   }
>   
> +int amdgpu_ip_block_resume(struct amdgpu_ip_block *ip_block)
> +{
> +	int r;
> +
> +	if (ip_block->version->funcs->resume) {
> +		r = ip_block->version->funcs->resume(ip_block);
> +		if (r) {
> +			dev_err(ip_block->adev->dev,
> +				"resume of IP block <%s> failed %d\n",
> +				ip_block->version->funcs->name, r);
> +			return r;
> +		}
> +	}

Same here, please add "ip_block->status.hw = true;" and squash the patch 
together with the next one.

Regards,
Christian.

> +
> +	return 0;
> +}
> +
>   /**
>    * DOC: board_info
>    *



More information about the amd-gfx mailing list