summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2014-11-18 14:32:14 -0500
committerAlex Deucher <alexander.deucher@amd.com>2014-11-20 13:00:12 -0500
commitf281d0a37c423cb4cc8ef91ba7136848744c955f (patch)
treecca8079144e0ecbe8c6e8d5cf34c7da0fcf972ac
parent66648b81ce6a1ea713e299d2074d81d36cff4c94 (diff)
drm/radeon/ci: apply disp voltage changes before clk changes
Apply voltage changes for displays before changing clocks. Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/radeon/ci_dpm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/ci_dpm.c b/drivers/gpu/drm/radeon/ci_dpm.c
index c9963b589336..e7816281f0d7 100644
--- a/drivers/gpu/drm/radeon/ci_dpm.c
+++ b/drivers/gpu/drm/radeon/ci_dpm.c
@@ -3752,6 +3752,8 @@ static int ci_upload_dpm_level_enable_mask(struct radeon_device *rdev)
struct ci_power_info *pi = ci_get_pi(rdev);
PPSMC_Result result;
+ ci_apply_disp_minimum_voltage_request(rdev);
+
if (!pi->sclk_dpm_key_disabled) {
if (pi->dpm_level_enable_mask.sclk_dpm_enable_mask) {
result = ci_send_msg_to_smc_with_parameter(rdev,
@@ -3782,8 +3784,6 @@ static int ci_upload_dpm_level_enable_mask(struct radeon_device *rdev)
}
}
- ci_apply_disp_minimum_voltage_request(rdev);
-
return 0;
}