drm/radeon/dpm/rv7xx: restructure code

Needed to properly handle dynamic state adjustment.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/gpu/drm/radeon/cypress_dpm.c b/drivers/gpu/drm/radeon/cypress_dpm.c
index afdb7c7d4e86..2191501ab5fc 100644
--- a/drivers/gpu/drm/radeon/cypress_dpm.c
+++ b/drivers/gpu/drm/radeon/cypress_dpm.c
@@ -1930,13 +1930,15 @@ void cypress_dpm_disable(struct radeon_device *rdev)
 int cypress_dpm_set_power_state(struct radeon_device *rdev)
 {
         struct evergreen_power_info *eg_pi = evergreen_get_pi(rdev);
+        struct radeon_ps *new_ps = rdev->pm.dpm.requested_ps;
+        struct radeon_ps *old_ps = rdev->pm.dpm.current_ps;
 
         rv770_restrict_performance_levels_before_switch(rdev);
 
         if (eg_pi->pcie_performance_request)
                 cypress_notify_link_speed_change_before_state_change(rdev);
 
-        rv770_set_uvd_clock_before_set_eng_clock(rdev);
+        rv770_set_uvd_clock_before_set_eng_clock(rdev, new_ps, old_ps);
         rv770_halt_smc(rdev);
         cypress_upload_sw_state(rdev);
 
@@ -1947,7 +1949,7 @@ int cypress_dpm_set_power_state(struct radeon_device *rdev)
 
         rv770_resume_smc(rdev);
         rv770_set_sw_state(rdev);
-        rv770_set_uvd_clock_after_set_eng_clock(rdev);
+        rv770_set_uvd_clock_after_set_eng_clock(rdev, new_ps, old_ps);
 
         if (eg_pi->pcie_performance_request)
                 cypress_notify_link_speed_change_after_state_change(rdev);