diff options
| author |   Sunil Khatri <sunil.khatri@amd.com> | 2024-10-09 18:56:36 +0530 |
|---|---|---|
| committer |   Alex Deucher <alexander.deucher@amd.com> | 2024-10-22 17:50:39 -0400 |
| commit | aa980de3b5891009cbf1095543bf2577f7e5549d (patch) | |
| tree | a24f291555e94dbddf4c2af749660020e5c0037a | |
| parent | drm/amdgpu: clean the dummy resume functions (diff) | |
| download | wireguard-linux-aa980de3b5891009cbf1095543bf2577f7e5549d.tar.xz wireguard-linux-aa980de3b5891009cbf1095543bf2577f7e5549d.zip | |
drm/amdgpu: clean the dummy suspend functions
Remove the dummy suspend functions for all
ip blocks.
Signed-off-by: Sunil Khatri <sunil.khatri@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_isp.c | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/cik.c | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/si.c | 6 |
4 files changed, 2 insertions, 19 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_isp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_isp.c index 1383fd1644d6..4d82e8fec0f5 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_isp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_isp.c @@ -66,11 +66,6 @@ static int isp_hw_fini(struct amdgpu_ip_block *ip_block) return -ENODEV; } -static int isp_suspend(struct amdgpu_ip_block *ip_block) -{ - return 0; -} - static int isp_load_fw_by_psp(struct amdgpu_device *adev) { const struct common_firmware_header *hdr; @@ -161,7 +156,6 @@ static const struct amd_ip_funcs isp_ip_funcs = { .late_init = NULL, .hw_init = isp_hw_init, .hw_fini = isp_hw_fini, - .suspend = isp_suspend, .is_idle = isp_is_idle, .wait_for_idle = isp_wait_for_idle, .soft_reset = isp_soft_reset, diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c index fd31e2e9feb9..ed8015313827 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c @@ -613,7 +613,8 @@ static int amdgpu_vkms_suspend(struct amdgpu_ip_block *ip_block) r = drm_mode_config_helper_suspend(adev_to_drm(adev)); if (r) return r; - return amdgpu_vkms_hw_fini(ip_block); + + return 0; } static int amdgpu_vkms_resume(struct amdgpu_ip_block *ip_block) diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c index f3f6b32d4e2a..c8fb592f13df 100644 --- a/drivers/gpu/drm/amd/amdgpu/cik.c +++ b/drivers/gpu/drm/amd/amdgpu/cik.c @@ -2143,11 +2143,6 @@ static int cik_common_hw_fini(struct amdgpu_ip_block *ip_block) return 0; } -static int cik_common_suspend(struct amdgpu_ip_block *ip_block) -{ - return cik_common_hw_fini(ip_block); -} - static int cik_common_resume(struct amdgpu_ip_block *ip_block) { return cik_common_hw_init(ip_block); @@ -2187,7 +2182,6 @@ static const struct amd_ip_funcs cik_common_ip_funcs = { .late_init = NULL, .hw_init = cik_common_hw_init, .hw_fini = cik_common_hw_fini, - .suspend = cik_common_suspend, .resume = cik_common_resume, .is_idle = cik_common_is_idle, .wait_for_idle = cik_common_wait_for_idle, diff --git a/drivers/gpu/drm/amd/amdgpu/si.c b/drivers/gpu/drm/amd/amdgpu/si.c index f0817d5fbea8..66ccb76eb72a 100644 --- a/drivers/gpu/drm/amd/amdgpu/si.c +++ b/drivers/gpu/drm/amd/amdgpu/si.c @@ -2639,11 +2639,6 @@ static int si_common_hw_fini(struct amdgpu_ip_block *ip_block) return 0; } -static int si_common_suspend(struct amdgpu_ip_block *ip_block) -{ - return si_common_hw_fini(ip_block); -} - static int si_common_resume(struct amdgpu_ip_block *ip_block) { return si_common_hw_init(ip_block); @@ -2682,7 +2677,6 @@ static const struct amd_ip_funcs si_common_ip_funcs = { .late_init = NULL, .hw_init = si_common_hw_init, .hw_fini = si_common_hw_fini, - .suspend = si_common_suspend, .resume = si_common_resume, .is_idle = si_common_is_idle, .wait_for_idle = si_common_wait_for_idle, |