aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2013-05-14 18:24:34 -0400
committerAlex Deucher <alexander.deucher@amd.com>2013-06-27 19:40:14 -0400
commite34568b89233004f1679cc801859a00b48c6163d (patch)
treeeb2e9e4c630707a642b39bd0c6a1d5549c02fe21
parentd434e81e59aada1b68444e9a128d56ccc295f66a (diff)
drm/radeon/dpm: fix UVD clock setting on SI
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/radeon/si_dpm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c
index d1af9549f302..494ba17cc028 100644
--- a/drivers/gpu/drm/radeon/si_dpm.c
+++ b/drivers/gpu/drm/radeon/si_dpm.c
@@ -5883,7 +5883,7 @@ int si_dpm_set_power_state(struct radeon_device *rdev)
5883 } 5883 }
5884 if (eg_pi->pcie_performance_request) 5884 if (eg_pi->pcie_performance_request)
5885 si_request_link_speed_change_before_state_change(rdev, new_ps, old_ps); 5885 si_request_link_speed_change_before_state_change(rdev, new_ps, old_ps);
5886 rv770_set_uvd_clock_before_set_eng_clock(rdev, new_ps, old_ps); 5886 ni_set_uvd_clock_before_set_eng_clock(rdev, new_ps, old_ps);
5887 ret = si_enable_power_containment(rdev, new_ps, false); 5887 ret = si_enable_power_containment(rdev, new_ps, false);
5888 if (ret) { 5888 if (ret) {
5889 DRM_ERROR("si_enable_power_containment failed\n"); 5889 DRM_ERROR("si_enable_power_containment failed\n");
@@ -5948,7 +5948,7 @@ int si_dpm_set_power_state(struct radeon_device *rdev)
5948 DRM_ERROR("si_set_sw_state failed\n"); 5948 DRM_ERROR("si_set_sw_state failed\n");
5949 return ret; 5949 return ret;
5950 } 5950 }
5951 rv770_set_uvd_clock_after_set_eng_clock(rdev, new_ps, old_ps); 5951 ni_set_uvd_clock_after_set_eng_clock(rdev, new_ps, old_ps);
5952 if (eg_pi->pcie_performance_request) 5952 if (eg_pi->pcie_performance_request)
5953 si_notify_link_speed_change_after_state_change(rdev, new_ps, old_ps); 5953 si_notify_link_speed_change_after_state_change(rdev, new_ps, old_ps);
5954 ret = si_set_power_state_conditionally_enable_ulv(rdev, new_ps); 5954 ret = si_set_power_state_conditionally_enable_ulv(rdev, new_ps);