Revert "drm/vc4: Relax VEC modeline requirements and add progressive mode support"

This reverts commit 2ef74e9687c92e26d4b047c2499c96b215ec7f00.

The mode that is now generated by the DRM core doesn't validate against
these criteria

diff --git a/drivers/gpu/drm/vc4/vc4_vec.c b/drivers/gpu/drm/vc4/vc4_vec.c
index c57df20..a958f04 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_vec.c
+++ b/drivers/gpu/drm/vc4/vc4_vec.c
@@ -757,18 +757,6 @@ static int vc4_vec_encoder_atomic_check(struct drm_encoder *encoder,
                if ((mode->crtc_vtotal - mode->crtc_vsync_end) < 4)
                        return -EINVAL;
 
-               if ((mode->flags & DRM_MODE_FLAG_INTERLACE) &&
-                   (mode->vdisplay % 2 != 0 ||
-                    mode->vsync_start % 2 != 1 ||
-                    mode->vsync_end % 2 != 1 ||
-                    mode->vtotal % 2 != 1))
-                       return -EINVAL;
-
-               /* progressive mode is hard-wired to 262 total lines */
-               if (!(mode->flags & DRM_MODE_FLAG_INTERLACE) &&
-                   mode->crtc_vtotal != 262)
-                       return -EINVAL;
-
                break;
 
        /* PAL/SECAM */
@@ -788,18 +776,6 @@ static int vc4_vec_encoder_atomic_check(struct drm_encoder *encoder,
                if ((mode->crtc_vtotal - mode->crtc_vsync_end) < 2)
                        return -EINVAL;
 
-               if ((mode->flags & DRM_MODE_FLAG_INTERLACE) &&
-                   (mode->vdisplay % 2 != 0 ||
-                    mode->vsync_start % 2 != 0 ||
-                    mode->vsync_end % 2 != 0 ||
-                    mode->vtotal % 2 != 1))
-                       return -EINVAL;
-
-               /* progressive mode is hard-wired to 312 total lines */
-               if (!(mode->flags & DRM_MODE_FLAG_INTERLACE) &&
-                   mode->crtc_vtotal != 312)
-                       return -EINVAL;
-
                break;
 
        default: