]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
pmdomain: imx8mp-blk-ctrl: imx8mp_blk: Add fdcc clock to hdmimix domain
authorAdam Ford <aford173@gmail.com>
Sat, 3 Feb 2024 16:52:44 +0000 (10:52 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 13 Apr 2024 11:07:30 +0000 (13:07 +0200)
[ Upstream commit 697624ee8ad557ab5417f985d2c804241a7ad30d ]

According to i.MX8MP RM and HDMI ADD, the fdcc clock is part of
hdmi rx verification IP that should not enable for HDMI TX.
But actually if the clock is disabled before HDMI/LCDIF probe,
LCDIF will not get pixel clock from HDMI PHY and print the error
logs:

[CRTC:39:crtc-2] vblank wait timed out
WARNING: CPU: 2 PID: 9 at drivers/gpu/drm/drm_atomic_helper.c:1634 drm_atomic_helper_wait_for_vblanks.part.0+0x23c/0x260

Add fdcc clock to LCDIF and HDMI TX power domains to fix the issue.

Signed-off-by: Adam Ford <aford173@gmail.com>
Reviewed-by: Jacky Bai <ping.bai@nxp.com>
Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
Link: https://lore.kernel.org/r/20240203165307.7806-5-aford173@gmail.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/pmdomain/imx/imx8mp-blk-ctrl.c

index c6ac32c1a8c171439c7fcbe598e24fafa0146004..31693add7d633f7a370a58e96ae2b40829107c44 100644 (file)
@@ -55,7 +55,7 @@ struct imx8mp_blk_ctrl_domain_data {
        const char *gpc_name;
 };
 
-#define DOMAIN_MAX_CLKS 2
+#define DOMAIN_MAX_CLKS 3
 #define DOMAIN_MAX_PATHS 3
 
 struct imx8mp_blk_ctrl_domain {
@@ -457,8 +457,8 @@ static const struct imx8mp_blk_ctrl_domain_data imx8mp_hdmi_domain_data[] = {
        },
        [IMX8MP_HDMIBLK_PD_LCDIF] = {
                .name = "hdmiblk-lcdif",
-               .clk_names = (const char *[]){ "axi", "apb" },
-               .num_clks = 2,
+               .clk_names = (const char *[]){ "axi", "apb", "fdcc" },
+               .num_clks = 3,
                .gpc_name = "lcdif",
                .path_names = (const char *[]){"lcdif-hdmi"},
                .num_paths = 1,
@@ -483,8 +483,8 @@ static const struct imx8mp_blk_ctrl_domain_data imx8mp_hdmi_domain_data[] = {
        },
        [IMX8MP_HDMIBLK_PD_HDMI_TX] = {
                .name = "hdmiblk-hdmi-tx",
-               .clk_names = (const char *[]){ "apb", "ref_266m" },
-               .num_clks = 2,
+               .clk_names = (const char *[]){ "apb", "ref_266m", "fdcc" },
+               .num_clks = 3,
                .gpc_name = "hdmi-tx",
        },
        [IMX8MP_HDMIBLK_PD_HDMI_TX_PHY] = {