[Intel-gfx] [PATCH v2 29/41] drm/vc4: vec: Switch for common modes

[Maxime Ripard]

Now that the core has a definition for the 525 and 625 lines analog TV
modes, let's switch to it for vc4.

Signed-off-by: Maxime Ripard <max...@cerno.tech>

diff --git a/drivers/gpu/drm/vc4/vc4_vec.c b/drivers/gpu/drm/vc4/vc4_vec.c
index d1d40b69279e..63e4e617e321 100644
--- a/drivers/gpu/drm/vc4/vc4_vec.c
+++ b/drivers/gpu/drm/vc4/vc4_vec.c
@@ -224,38 +224,24 @@ static const struct debugfs_reg32 vec_regs[] = {
        VC4_REG32(VEC_DAC_MISC),
 };
 
-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 + 7, 480 + 7 + 6, 525, 0,
-                DRM_MODE_FLAG_INTERLACE)
-};
-
-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 + 4, 576 + 4 + 6, 625, 0,
-                DRM_MODE_FLAG_INTERLACE)
-};
-
 static const struct vc4_vec_tv_mode vc4_vec_tv_modes[] = {
        [VC4_VEC_TV_MODE_NTSC] = {
-               .mode = &ntsc_mode,
+               .mode = &drm_mode_480i,
                .config0 = VEC_CONFIG0_NTSC_STD | VEC_CONFIG0_PDEN,
                .config1 = VEC_CONFIG1_C_CVBS_CVBS,
        },
        [VC4_VEC_TV_MODE_NTSC_J] = {
-               .mode = &ntsc_mode,
+               .mode = &drm_mode_480i,
                .config0 = VEC_CONFIG0_NTSC_STD,
                .config1 = VEC_CONFIG1_C_CVBS_CVBS,
        },
        [VC4_VEC_TV_MODE_PAL] = {
-               .mode = &pal_mode,
+               .mode = &drm_mode_576i,
                .config0 = VEC_CONFIG0_PAL_BDGHI_STD,
                .config1 = VEC_CONFIG1_C_CVBS_CVBS,
        },
        [VC4_VEC_TV_MODE_PAL_M] = {
-               .mode = &pal_mode,
+               .mode = &drm_mode_576i,
                .config0 = VEC_CONFIG0_PAL_BDGHI_STD,
                .config1 = VEC_CONFIG1_C_CVBS_CVBS | VEC_CONFIG1_CUSTOM_FREQ,
                .custom_freq = 0x223b61d1,

-- 
b4 0.10.0-dev-65ba7