[PATCH] drm/amdgpu: fix dm_suspend/resume arguments to ip_block

[Christian König]

Am 08.10.24 um 05:59 schrieb Sunil Khatri:
> "build failure after merge of the amdgpu tree"
> dm_suspend/dm_resume functions argument mismatch
> not caught in validation as it was under config
> CONFIG_DEBUG_KERNEL_DC which wasnt enabled by
> default.
>
> Change argument from adev to ip_block.
>
> Signed-off-by: Sunil Khatri <sunil.khatri at amd.com>

Acked-by: Christian König <christian.koenig at amd.com>

> ---
>   drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 9 +++++++--
>   1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> index e4511f2fb929..6d5b899941af 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -5201,15 +5201,20 @@ static ssize_t s3_debug_store(struct device *device,
>   	int s3_state;
>   	struct drm_device *drm_dev = dev_get_drvdata(device);
>   	struct amdgpu_device *adev = drm_to_adev(drm_dev);
> +	struct amdgpu_ip_block *ip_block;
> +
> +	ip_block = amdgpu_device_ip_get_ip_block(adev, AMD_IP_BLOCK_TYPE_DCE);
> +	if (!ip_block)
> +		return -EINVAL;
>   
>   	ret = kstrtoint(buf, 0, &s3_state);
>   
>   	if (ret == 0) {
>   		if (s3_state) {
> -			dm_resume(adev);
> +			dm_resume(ip_block);
>   			drm_kms_helper_hotplug_event(adev_to_drm(adev));
>   		} else
> -			dm_suspend(adev);
> +			dm_suspend(ip_block);
>   	}
>   
>   	return ret == 0 ? count : 0;