drm/radeon/SI: fix TDP adjustment in set_power_state
Fixes hangs with DPM in some cases.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c
index 494ba17..6918f07 100644
--- a/drivers/gpu/drm/radeon/si_dpm.c
+++ b/drivers/gpu/drm/radeon/si_dpm.c
@@ -5864,6 +5864,32 @@
return 0;
}
+static int si_power_control_set_level(struct radeon_device *rdev)
+{
+ struct radeon_ps *new_ps = rdev->pm.dpm.requested_ps;
+ int ret;
+
+ ret = si_restrict_performance_levels_before_switch(rdev);
+ if (ret)
+ return ret;
+ ret = si_halt_smc(rdev);
+ if (ret)
+ return ret;
+ ret = si_populate_smc_tdp_limits(rdev, new_ps);
+ if (ret)
+ return ret;
+ ret = si_populate_smc_tdp_limits_2(rdev, new_ps);
+ if (ret)
+ return ret;
+ ret = si_resume_smc(rdev);
+ if (ret)
+ return ret;
+ ret = si_set_sw_state(rdev);
+ if (ret)
+ return ret;
+ return 0;
+}
+
int si_dpm_set_power_state(struct radeon_device *rdev)
{
struct evergreen_power_info *eg_pi = evergreen_get_pi(rdev);
@@ -5928,16 +5954,6 @@
}
si_set_pcie_lane_width_in_smc(rdev, new_ps, old_ps);
- ret = si_populate_smc_tdp_limits(rdev, new_ps);
- if (ret) {
- DRM_ERROR("si_populate_smc_tdp_limits failed\n");
- return ret;
- }
- ret = si_populate_smc_tdp_limits_2(rdev, new_ps);
- if (ret) {
- DRM_ERROR("si_populate_smc_tdp_limits_2 failed\n");
- return ret;
- }
ret = si_resume_smc(rdev);
if (ret) {
DRM_ERROR("si_resume_smc failed\n");
@@ -5967,6 +5983,12 @@
return ret;
}
+ ret = si_power_control_set_level(rdev);
+ if (ret) {
+ DRM_ERROR("si_power_control_set_level failed\n");
+ return ret;
+ }
+
#if 0
/* XXX */
ret = si_unrestrict_performance_levels_after_switch(rdev);
@@ -5979,33 +6001,6 @@
return 0;
}
-
-int si_power_control_set_level(struct radeon_device *rdev)
-{
- struct radeon_ps *new_ps = rdev->pm.dpm.requested_ps;
- int ret;
-
- ret = si_restrict_performance_levels_before_switch(rdev);
- if (ret)
- return ret;
- ret = si_halt_smc(rdev);
- if (ret)
- return ret;
- ret = si_populate_smc_tdp_limits(rdev, new_ps);
- if (ret)
- return ret;
- ret = si_populate_smc_tdp_limits_2(rdev, new_ps);
- if (ret)
- return ret;
- ret = si_resume_smc(rdev);
- if (ret)
- return ret;
- ret = si_set_sw_state(rdev);
- if (ret)
- return ret;
- return 0;
-}
-
void si_dpm_post_set_power_state(struct radeon_device *rdev)
{
struct evergreen_power_info *eg_pi = evergreen_get_pi(rdev);