From: Alex Deucher Date: Tue, 14 May 2013 22:24:34 +0000 (-0400) Subject: drm/radeon/dpm: fix UVD clock setting on SI X-Git-Tag: v3.11-rc1~65^2~60^2~3 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e34568b89233004f1679cc801859a00b48c6163d;p=~emulex%2Finfiniband.git drm/radeon/dpm: fix UVD clock setting on SI Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c index d1af9549f30..494ba17cc02 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) } if (eg_pi->pcie_performance_request) si_request_link_speed_change_before_state_change(rdev, new_ps, old_ps); - rv770_set_uvd_clock_before_set_eng_clock(rdev, new_ps, old_ps); + ni_set_uvd_clock_before_set_eng_clock(rdev, new_ps, old_ps); ret = si_enable_power_containment(rdev, new_ps, false); if (ret) { DRM_ERROR("si_enable_power_containment failed\n"); @@ -5948,7 +5948,7 @@ int si_dpm_set_power_state(struct radeon_device *rdev) DRM_ERROR("si_set_sw_state failed\n"); return ret; } - rv770_set_uvd_clock_after_set_eng_clock(rdev, new_ps, old_ps); + ni_set_uvd_clock_after_set_eng_clock(rdev, new_ps, old_ps); if (eg_pi->pcie_performance_request) si_notify_link_speed_change_after_state_change(rdev, new_ps, old_ps); ret = si_set_power_state_conditionally_enable_ulv(rdev, new_ps);