Skip to content
/ linux Public

Commit 16790e7

Browse files
WangSungHuaiSasha Levin
authored andcommitted
drm/amd/display: Revert "init dispclk from bootup clock for DCN315"
[ Upstream commit a625dc4 ] [Why&How] This reverts commit 14bb17c. Due to the change, the display shows garbage on startup. We have an alternative solution for the original issue: d24203b ("drm/amd/display: Re-check seamless boot can be enabled or not") Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> Signed-off-by: Wang, Sung-huai <Danny.Wang@amd.com> Signed-off-by: Matthew Stewart <matthew.stewart2@amd.com> Tested-by: Dan Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 37282c9 commit 16790e7

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ static void dcn315_update_clocks(struct clk_mgr *clk_mgr_base,
138138
if (dc->work_arounds.skip_clock_update)
139139
return;
140140

141-
clk_mgr_base->clks.zstate_support = new_clocks->zstate_support;
141+
display_count = dcn315_get_active_display_cnt_wa(dc, context);
142142
/*
143143
* if it is safe to lower, but we are already in the lower state, we don't have to do anything
144144
* also if safe to lower is false, we just go in the higher state
@@ -151,7 +151,6 @@ static void dcn315_update_clocks(struct clk_mgr *clk_mgr_base,
151151
}
152152
/* check that we're not already in lower */
153153
if (clk_mgr_base->clks.pwr_state != DCN_PWR_STATE_LOW_POWER) {
154-
display_count = dcn315_get_active_display_cnt_wa(dc, context);
155154
/* if we can go lower, go lower */
156155
if (display_count == 0) {
157156
union display_idle_optimization_u idle_info = { 0 };

0 commit comments

Comments
 (0)