From ccd3ea1ccb1e8cb2b759bd220ced5136e0a5df37 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 25 Jan 2024 17:59:52 +0000 Subject: [PATCH 0855/1002] 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 --- drivers/gpu/drm/vc4/vc4_vec.c | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_vec.c b/drivers/gpu/drm/vc4/vc4_vec.c index c57df20a9b49..a958f04737a9 100644 --- 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: -- 2.44.0