diff options
| author | Huang Rui <[email protected]> | 2017-04-10 06:40:51 +0000 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2017-04-28 21:32:12 +0000 |
| commit | 4573f0f21d6c40a9426d0418646d87bbf77d6ab5 (patch) | |
| tree | 9964f7561a7dc8071b1f836a4d8eb052a9db1111 | |
| parent | drm/amdgpu:fix race condition (diff) | |
| download | kernel-4573f0f21d6c40a9426d0418646d87bbf77d6ab5.tar.gz kernel-4573f0f21d6c40a9426d0418646d87bbf77d6ab5.zip | |
drm/amd/powerplay: fix suspend error on DPM disabled
Don't fail if DPM is disabled.
Signed-off-by: Huang Rui <[email protected]>
Reviewed-by: Alex Deucher <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
| -rw-r--r-- | drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 4 |
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; |