drm/amd/display: program display clock on cache match

[Why]
We seem to have an issue where high enough display clock
will not get set properly during S3 resume if we only
call vbios once

[How]
Expand condition of display clock programming to happen
even when cached display clock matches requested display
clock

Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Dmytro Laktyushkin 2018-07-26 12:17:58 -04:00 committed by Alex Deucher
parent fb7b11e163
commit 99326ee362
2 changed files with 5 additions and 1 deletions

View File

@ -625,7 +625,9 @@ static void dcn1_update_clocks(struct dccg *dccg,
} }
/* dcn1 dppclk is tied to dispclk */ /* dcn1 dppclk is tied to dispclk */
if (should_set_clock(safe_to_lower, new_clocks->dispclk_khz, dccg->clks.dispclk_khz)) { /* program dispclk on = as a w/a for sleep resume clock ramping issues */
if (should_set_clock(safe_to_lower, new_clocks->dispclk_khz, dccg->clks.dispclk_khz)
|| new_clocks->dispclk_khz == dccg->clks.dispclk_khz) {
dcn1_ramp_up_dispclk_with_dpp(dccg, new_clocks); dcn1_ramp_up_dispclk_with_dpp(dccg, new_clocks);
dccg->clks.dispclk_khz = new_clocks->dispclk_khz; dccg->clks.dispclk_khz = new_clocks->dispclk_khz;

View File

@ -1089,6 +1089,8 @@ static void dcn10_init_hw(struct dc *dc)
} }
enable_power_gating_plane(dc->hwseq, true); enable_power_gating_plane(dc->hwseq, true);
memset(&dc->res_pool->dccg->clks, 0, sizeof(dc->res_pool->dccg->clks));
} }
static void reset_hw_ctx_wrap( static void reset_hw_ctx_wrap(