]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/rockchip: inno_hdmi: Fix video timing
authorAlex Bee <knaerzche@gmail.com>
Fri, 22 Dec 2023 17:41:54 +0000 (18:41 +0100)
committerSasha Levin <sashal@kernel.org>
Tue, 26 Mar 2024 22:21:54 +0000 (18:21 -0400)
[ Upstream commit 47a145c03484d33e65d773169d5ca1b9fe2a492e ]

The controller wants the difference between *total and *sync_start in the
HDMI_VIDEO_EXT_*DELAY registers. Otherwise the signal is very unstable for
certain non-VIC modes. See downstream commit [0].

[0] https://github.com/rockchip-linux/kernel/commit/8eb559f2502c

Fixes: 412d4ae6b7a5 ("drm/rockchip: hdmi: add Innosilicon HDMI support")
Co-developed-by: Zheng Yang <zhengyang@rock-chips.com>
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Signed-off-by: Alex Bee <knaerzche@gmail.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20231222174220.55249-4-knaerzche@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/rockchip/inno_hdmi.c

index 78120da5e63aa24a0977170bf0739a601e652423..27540d308ccb98dc28bfb4018922d850208cb9ba 100644 (file)
@@ -402,7 +402,7 @@ static int inno_hdmi_config_video_timing(struct inno_hdmi *hdmi,
        hdmi_writeb(hdmi, HDMI_VIDEO_EXT_HBLANK_L, value & 0xFF);
        hdmi_writeb(hdmi, HDMI_VIDEO_EXT_HBLANK_H, (value >> 8) & 0xFF);
 
-       value = mode->hsync_start - mode->hdisplay;
+       value = mode->htotal - mode->hsync_start;
        hdmi_writeb(hdmi, HDMI_VIDEO_EXT_HDELAY_L, value & 0xFF);
        hdmi_writeb(hdmi, HDMI_VIDEO_EXT_HDELAY_H, (value >> 8) & 0xFF);
 
@@ -417,7 +417,7 @@ static int inno_hdmi_config_video_timing(struct inno_hdmi *hdmi,
        value = mode->vtotal - mode->vdisplay;
        hdmi_writeb(hdmi, HDMI_VIDEO_EXT_VBLANK, value & 0xFF);
 
-       value = mode->vsync_start - mode->vdisplay;
+       value = mode->vtotal - mode->vsync_start;
        hdmi_writeb(hdmi, HDMI_VIDEO_EXT_VDELAY, value & 0xFF);
 
        value = mode->vsync_end - mode->vsync_start;