Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amd/display: Fix DTBCLK disable requests and SRC_SEL programming

[Description]
- When transitioning FRL / DP2 is not required, we will always request
DTBCLK = 0Mhz, but PMFW returns the min freq
- This causes us to make DTBCLK requests every time we call optimize
after transitioning from FRL to non-FRL
- If DTBCLK is not required, request the min instead (then we only need
to make 1 extra request at boot time)
- Also when programming PIPE_DTO_SRC_SEL, don't programming for DP
first, just programming once for the required selection (programming
DP on an HDMI connection then switching back causes corruption)

Reviewed-by: Dillon Varone <Dillon.Varone@amd.com>
Acked-by: Jasdeep Dhillon <jdhillon@amd.com>
Signed-off-by: Alvin Lee <Alvin.Lee2@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Alvin Lee and committed by
Alex Deucher
f6015da7 7a259c6d

+2 -6
+1 -1
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c
··· 438 438 } 439 439 440 440 if (!new_clocks->dtbclk_en) { 441 - new_clocks->ref_dtbclk_khz = 0; 441 + new_clocks->ref_dtbclk_khz = clk_mgr_base->bw_params->clk_table.entries[0].dtbclk_mhz * 1000; 442 442 } 443 443 444 444 /* clock limits are received with MHz precision, divide by 1000 to prevent setting clocks at every call */
+1 -5
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c
··· 225 225 } else { 226 226 REG_UPDATE_2(OTG_PIXEL_RATE_CNTL[params->otg_inst], 227 227 DTBCLK_DTO_ENABLE[params->otg_inst], 0, 228 - PIPE_DTO_SRC_SEL[params->otg_inst], 1); 229 - if (params->is_hdmi) 230 - REG_UPDATE(OTG_PIXEL_RATE_CNTL[params->otg_inst], 231 - PIPE_DTO_SRC_SEL[params->otg_inst], 0); 232 - 228 + PIPE_DTO_SRC_SEL[params->otg_inst], params->is_hdmi ? 0 : 1); 233 229 REG_WRITE(DTBCLK_DTO_MODULO[params->otg_inst], 0); 234 230 REG_WRITE(DTBCLK_DTO_PHASE[params->otg_inst], 0); 235 231 }