drm/radeon/dpm: fix UVD clock setting on SI
authorAlex Deucher <alexander.deucher@amd.com>
Tue, 14 May 2013 22:24:34 +0000 (18:24 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 27 Jun 2013 23:40:14 +0000 (19:40 -0400)
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/radeon/si_dpm.c

index d1af9549f302a640dffe7d7f70e442db2a71f79f..494ba17cc028ddf74eba8f0093422563ba0b9d2c 100644 (file)
@@ -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);