From: Mateusz Kwiatkowski <[email protected]>

[ Upstream commit 30d7565be96b3946c18a1ce3fd538f7946839092 ]

This commit fixes vertical timings of the VEC (composite output) modes
to accurately represent the 525-line ("NTSC") and 625-line ("PAL") ITU-R
standards.

Previous timings were actually defined as 502 and 601 lines, resulting
in non-standard 62.69 Hz and 52 Hz signals being generated,
respectively.

Signed-off-by: Mateusz Kwiatkowski <[email protected]>
Acked-by: Noralf Trønnes <[email protected]>
Signed-off-by: Maxime Ripard <[email protected]>
Link: 
https://patchwork.freedesktop.org/patch/msgid/[email protected]
Signed-off-by: Sasha Levin <[email protected]>
---
 drivers/gpu/drm/vc4/vc4_vec.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/vc4/vc4_vec.c b/drivers/gpu/drm/vc4/vc4_vec.c
index bd5b8eb58b18..c6bd168a5898 100644
--- a/drivers/gpu/drm/vc4/vc4_vec.c
+++ b/drivers/gpu/drm/vc4/vc4_vec.c
@@ -257,7 +257,7 @@ static void vc4_vec_ntsc_j_mode_set(struct vc4_vec *vec)
 static const struct drm_display_mode ntsc_mode = {
        DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 13500,
                 720, 720 + 14, 720 + 14 + 64, 720 + 14 + 64 + 60, 0,
-                480, 480 + 3, 480 + 3 + 3, 480 + 3 + 3 + 16, 0,
+                480, 480 + 7, 480 + 7 + 6, 525, 0,
                 DRM_MODE_FLAG_INTERLACE)
 };
 
@@ -279,7 +279,7 @@ static void vc4_vec_pal_m_mode_set(struct vc4_vec *vec)
 static const struct drm_display_mode pal_mode = {
        DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 13500,
                 720, 720 + 20, 720 + 20 + 64, 720 + 20 + 64 + 60, 0,
-                576, 576 + 2, 576 + 2 + 3, 576 + 2 + 3 + 20, 0,
+                576, 576 + 4, 576 + 4 + 6, 625, 0,
                 DRM_MODE_FLAG_INTERLACE)
 };
 
-- 
2.35.1

Reply via email to