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

clk: mediatek: mt8188-topckgen: Refactor parents for top_dp/edp muxes

The top_dp and top_edp muxes can be both parented to either TVDPLL1
or TVDPLL2, two identically specced PLLs for the specific purpose of
giving out pixel clock: this becomes a problem when the MediaTek
DisplayPort Interface (DPI) driver tries to set the pixel clock rate.

In the usecase of two simultaneous outputs (using two controllers),
it was seen that one of the displays would sometimes display garbled
output (if any at all) and this was because:
- top_edp was set to TVDPLL1, outputting X GHz
- top_dp was set to TVDPLL2, outputting Y GHz
- mtk_dpi calls clk_set_rate(top_edp, Z GHz)
- top_dp is switched to TVDPLL1
- TVDPLL1 changes its rate, top_edp outputs the wrong rate.
- eDP display is garbled

To solve this issue, remove all TVDPLL1 parents from `top_dp` and
all TVDPLL2 parents from `top_edp`, plus, necessarily switch both
clocks to use the new MUX_GATE_CLR_SET_UPD_INDEXED() macro to be
able to use the right bit index for the new parents list.

Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20231103102533.69280-4-angelogioacchino.delregno@collabora.com
Reviewed-by: Alexandre Mergnat <amergnat@baylibre.com>
Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
Tested-by: Fei Shao <fshao@chromium.org>
Reviewed-by: Fei Shao <fshao@chromium.org>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

authored by

AngeloGioacchino Del Regno and committed by
Stephen Boyd
ebbf49d4 831f9216

+14 -13
+14 -13
drivers/clk/mediatek/clk-mt8188-topckgen.c
··· 475 475 "mainpll_d4_d2" 476 476 }; 477 477 478 + /* 479 + * Both DP/eDP can be parented to TVDPLL1 and TVDPLL2, but we force using 480 + * TVDPLL1 on eDP and TVDPLL2 on DP to avoid changing the "other" PLL rate 481 + * in dual output case, which would lead to corruption of functionality loss. 482 + */ 478 483 static const char * const dp_parents[] = { 479 484 "clk26m", 480 - "tvdpll1_d2", 481 485 "tvdpll2_d2", 482 - "tvdpll1_d4", 483 486 "tvdpll2_d4", 484 - "tvdpll1_d8", 485 487 "tvdpll2_d8", 486 - "tvdpll1_d16", 487 488 "tvdpll2_d16" 488 489 }; 490 + static const u8 dp_parents_idx[] = { 0, 2, 4, 6, 8 }; 489 491 490 492 static const char * const edp_parents[] = { 491 493 "clk26m", 492 494 "tvdpll1_d2", 493 - "tvdpll2_d2", 494 495 "tvdpll1_d4", 495 - "tvdpll2_d4", 496 496 "tvdpll1_d8", 497 - "tvdpll2_d8", 498 - "tvdpll1_d16", 499 - "tvdpll2_d16" 497 + "tvdpll1_d16" 500 498 }; 499 + static const u8 edp_parents_idx[] = { 0, 1, 3, 5, 7 }; 501 500 502 501 static const char * const dpi_parents[] = { 503 502 "clk26m", ··· 1037 1038 MUX_GATE_CLR_SET_UPD(CLK_TOP_SSPM, "top_sspm", 1038 1039 sspm_parents, 0x080, 0x084, 0x088, 24, 4, 31, 0x08, 3), 1039 1040 /* CLK_CFG_9 */ 1040 - MUX_GATE_CLR_SET_UPD(CLK_TOP_DP, "top_dp", 1041 - dp_parents, 0x08C, 0x090, 0x094, 0, 4, 7, 0x08, 4), 1042 - MUX_GATE_CLR_SET_UPD(CLK_TOP_EDP, "top_edp", 1043 - edp_parents, 0x08C, 0x090, 0x094, 8, 4, 15, 0x08, 5), 1041 + MUX_GATE_CLR_SET_UPD_INDEXED(CLK_TOP_DP, "top_dp", 1042 + dp_parents, dp_parents_idx, 0x08C, 0x090, 0x094, 1043 + 0, 4, 7, 0x08, 4), 1044 + MUX_GATE_CLR_SET_UPD_INDEXED(CLK_TOP_EDP, "top_edp", 1045 + edp_parents, edp_parents_idx, 0x08C, 0x090, 0x094, 1046 + 8, 4, 15, 0x08, 5), 1044 1047 MUX_GATE_CLR_SET_UPD(CLK_TOP_DPI, "top_dpi", 1045 1048 dpi_parents, 0x08C, 0x090, 0x094, 16, 4, 23, 0x08, 6), 1046 1049 MUX_GATE_CLR_SET_UPD(CLK_TOP_DISP_PWM0, "top_disp_pwm0",