aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/ni_dpm.c
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2013-02-11 13:27:23 -0500
committerAlex Deucher <alexander.deucher@amd.com>2013-06-27 19:16:21 -0400
commita5b91af2e2e36e6031296675cf0c060879268032 (patch)
tree0ecd825ecb4b8122f9c4cb6dae1943c701bb85f2 /drivers/gpu/drm/radeon/ni_dpm.c
parentdrm/radeon/dpm: remove broken dyn state remnants (diff)
downloadlinux-dev-a5b91af2e2e36e6031296675cf0c060879268032.tar.xz
linux-dev-a5b91af2e2e36e6031296675cf0c060879268032.zip
drm/radeon: add missing UVD clock set in cayman dpm code
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/ni_dpm.c')
-rw-r--r--drivers/gpu/drm/radeon/ni_dpm.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/ni_dpm.c b/drivers/gpu/drm/radeon/ni_dpm.c
index d91e887a6312..7530ee9591d3 100644
--- a/drivers/gpu/drm/radeon/ni_dpm.c
+++ b/drivers/gpu/drm/radeon/ni_dpm.c
@@ -3681,9 +3681,11 @@ int ni_dpm_set_power_state(struct radeon_device *rdev)
{
struct evergreen_power_info *eg_pi = evergreen_get_pi(rdev);
struct radeon_ps *new_ps = &eg_pi->requested_rps;
+ struct radeon_ps *old_ps = &eg_pi->current_rps;
int ret;
ni_restrict_performance_levels_before_switch(rdev);
+ rv770_set_uvd_clock_before_set_eng_clock(rdev, new_ps, old_ps);
ni_enable_power_containment(rdev, new_ps, false);
ni_enable_smc_cac(rdev, new_ps, false);
rv770_halt_smc(rdev);
@@ -3698,6 +3700,7 @@ int ni_dpm_set_power_state(struct radeon_device *rdev)
ni_populate_smc_tdp_limits(rdev, new_ps);
rv770_resume_smc(rdev);
rv770_set_sw_state(rdev);
+ rv770_set_uvd_clock_after_set_eng_clock(rdev, new_ps, old_ps);
ni_enable_smc_cac(rdev, new_ps, true);
ni_enable_power_containment(rdev, new_ps, true);