summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
diff options
context:
space:
mode:
authorFlora Cui <Flora.Cui@amd.com>2016-02-15 10:45:59 +0300
committerAlex Deucher <alexander.deucher@amd.com>2016-05-05 03:27:22 +0300
commit538333f0dcc00e24ca4bd63905fa75aa41b4c665 (patch)
treef47440e3a732b85af83a247c38d07892d6a615e3 /drivers/gpu/drm/amd/powerplay/amd_powerplay.c
parent62a86fc2349b7ae318e91a55aa306a120d233a21 (diff)
downloadlinux-538333f0dcc00e24ca4bd63905fa75aa41b4c665.tar.xz
drm/amd/powerplay: add default clockgating handling
This is to workaround regression introduced in 46c34bcb6a15dd85329a39a5e72c62108626acdc. It should be reverted with a final fix. Signed-off-by: Flora Cui <Flora.Cui@amd.com> Reviewed-by: Rex Zhu <Rex.Zhu@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/powerplay/amd_powerplay.c')
-rw-r--r--drivers/gpu/drm/amd/powerplay/amd_powerplay.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
index 94b78095e1ce..32a6a6f8ffcb 100644
--- a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
+++ b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
@@ -188,10 +188,12 @@ static int pp_set_clockgating_state(void *handle,
hwmgr = ((struct pp_instance *)handle)->hwmgr;
- if (hwmgr == NULL || hwmgr->hwmgr_func == NULL ||
- hwmgr->hwmgr_func->update_clock_gatings == NULL)
+ if (hwmgr == NULL || hwmgr->hwmgr_func == NULL)
return -EINVAL;
+ if (hwmgr->hwmgr_func->update_clock_gatings == NULL)
+ return 0;
+
if (state == AMD_CG_STATE_UNGATE)
pp_state = 0;
else