summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/powerplay
diff options
context:
space:
mode:
authorHuang Rui2017-04-10 08:40:51 +0200
committerAlex Deucher2017-04-28 23:32:12 +0200
commit4573f0f21d6c40a9426d0418646d87bbf77d6ab5 (patch)
tree9964f7561a7dc8071b1f836a4d8eb052a9db1111 /drivers/gpu/drm/amd/powerplay
parentdrm/amdgpu:fix race condition (diff)
downloadkernel-qcow2-linux-4573f0f21d6c40a9426d0418646d87bbf77d6ab5.tar.gz
kernel-qcow2-linux-4573f0f21d6c40a9426d0418646d87bbf77d6ab5.tar.xz
kernel-qcow2-linux-4573f0f21d6c40a9426d0418646d87bbf77d6ab5.zip
drm/amd/powerplay: fix suspend error on DPM disabled
Don't fail if DPM is disabled. Signed-off-by: Huang Rui <ray.huang@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/powerplay')
-rw-r--r--drivers/gpu/drm/amd/powerplay/amd_powerplay.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
index 9da5b0bb66d8..f73e80c4bf33 100644
--- a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
+++ b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
@@ -251,7 +251,9 @@ static int pp_suspend(void *handle)
ret = pp_check(pp_handle);
- if (ret != 0)
+ if (ret == PP_DPM_DISABLED)
+ return 0;
+ else if (ret != 0)
return ret;
eventmgr = pp_handle->eventmgr;