From: Alex Deucher Date: Tue, 18 Nov 2014 19:32:14 +0000 (-0500) Subject: drm/radeon/ci: apply disp voltage changes before clk changes X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f281d0a37c423cb4cc8ef91ba7136848744c955f;p=linux-beck.git drm/radeon/ci: apply disp voltage changes before clk changes Apply voltage changes for displays before changing clocks. Signed-off-by: Alex Deucher --- 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; }