From 5c6f4e8b278b09242311066706000f9a95e24048 Mon Sep 17 00:00:00 2001 From: ilmich Date: Sun, 15 Dec 2024 12:53:14 +0100 Subject: [PATCH] linux (Rockchip): BACKPORT: drm/rockchip: dw_hdmi: Enable 4K@60Hz mode on RK3399 and RK356x --- .../default/linux-1000-drm-rockchip.patch | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/projects/Rockchip/patches/linux/default/linux-1000-drm-rockchip.patch b/projects/Rockchip/patches/linux/default/linux-1000-drm-rockchip.patch index c3bec4f5ee..806fc88354 100644 --- a/projects/Rockchip/patches/linux/default/linux-1000-drm-rockchip.patch +++ b/projects/Rockchip/patches/linux/default/linux-1000-drm-rockchip.patch @@ -2929,3 +2929,43 @@ index 240552eb517f7e..36cc700766fd82 100644 if (hdmi->chip_data == &rk3568_chip_data) { regmap_write(hdmi->regmap, RK3568_GRF_VO_CON1, HIWORD_UPDATE(RK3568_HDMI_SDAIN_MSK | + +From 28f0ae48e7fdbd6cdcf3972c8d8686a529ae1ede Mon Sep 17 00:00:00 2001 +From: Jonas Karlman +Date: Sun, 8 Sep 2024 14:55:03 +0000 +Subject: [PATCH] drm/rockchip: dw_hdmi: Enable 4K@60Hz mode on RK3399 and + RK356x + +Use a maximum TMDS clock rate limit of 594MHz to enable use of HDMI2.0 +modes, e.g. 4K@60Hz, on RK3399 and RK3568. + +Signed-off-by: Jonas Karlman +Tested-by: Diederik de Haas # Quartz64 Model B +Signed-off-by: Heiko Stuebner +Link: https://patchwork.freedesktop.org/patch/msgid/20240908145511.3331451-7-jonas@kwiboo.se +--- + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +index 090d8c0f306f55..96e1097f993dc1 100644 +--- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c ++++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +@@ -481,7 +481,7 @@ static struct rockchip_hdmi_chip_data rk3399_chip_data = { + .lcdsel_grf_reg = RK3399_GRF_SOC_CON20, + .lcdsel_big = HIWORD_UPDATE(0, RK3399_HDMI_LCDC_SEL), + .lcdsel_lit = HIWORD_UPDATE(RK3399_HDMI_LCDC_SEL, RK3399_HDMI_LCDC_SEL), +- .max_tmds_clock = 340000, ++ .max_tmds_clock = 594000, + }; + + static const struct dw_hdmi_plat_data rk3399_hdmi_drv_data = { +@@ -495,7 +495,7 @@ static const struct dw_hdmi_plat_data rk3399_hdmi_drv_data = { + + static struct rockchip_hdmi_chip_data rk3568_chip_data = { + .lcdsel_grf_reg = -1, +- .max_tmds_clock = 340000, ++ .max_tmds_clock = 594000, + }; + + static const struct dw_hdmi_plat_data rk3568_hdmi_drv_data = {