| From acbc9592f9acf5a6c7d3658b0820ef4cd2bb2e2b Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 29 Aug 2022 15:11:42 +0200 |
| Subject: drm/vc4: vec: Fix timings for VEC modes |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com> |
| |
| [ 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 <kfyatek+publicgit@gmail.com> |
| Acked-by: Noralf TrΓΈnnes <noralf@tronnes.org> |
| Signed-off-by: Maxime Ripard <maxime@cerno.tech> |
| Link: https://patchwork.freedesktop.org/patch/msgid/20220728-rpi-analog-tv-properties-v2-28-459522d653a7@cerno.tech |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| 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 11fc3d6f66b1..4e2250b8fa23 100644 |
| --- a/drivers/gpu/drm/vc4/vc4_vec.c |
| +++ b/drivers/gpu/drm/vc4/vc4_vec.c |
| @@ -256,7 +256,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) |
| }; |
| |
| @@ -278,7 +278,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 |
| |
