Skip to content

Commit 9edc62c

Browse files
6by9popcornmix
authored andcommitted
Revert "drm/vc4: Relax VEC modeline requirements and add progressive mode support"
This reverts commit 2ef74e9. The mode that is now generated by the DRM core doesn't validate against these criteria
1 parent a05b447 commit 9edc62c

File tree

1 file changed

+0
-24
lines changed

1 file changed

+0
-24
lines changed

drivers/gpu/drm/vc4/vc4_vec.c

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -757,18 +757,6 @@ static int vc4_vec_encoder_atomic_check(struct drm_encoder *encoder,
757757
if ((mode->crtc_vtotal - mode->crtc_vsync_end) < 4)
758758
return -EINVAL;
759759

760-
if ((mode->flags & DRM_MODE_FLAG_INTERLACE) &&
761-
(mode->vdisplay % 2 != 0 ||
762-
mode->vsync_start % 2 != 1 ||
763-
mode->vsync_end % 2 != 1 ||
764-
mode->vtotal % 2 != 1))
765-
return -EINVAL;
766-
767-
/* progressive mode is hard-wired to 262 total lines */
768-
if (!(mode->flags & DRM_MODE_FLAG_INTERLACE) &&
769-
mode->crtc_vtotal != 262)
770-
return -EINVAL;
771-
772760
break;
773761

774762
/* PAL/SECAM */
@@ -788,18 +776,6 @@ static int vc4_vec_encoder_atomic_check(struct drm_encoder *encoder,
788776
if ((mode->crtc_vtotal - mode->crtc_vsync_end) < 2)
789777
return -EINVAL;
790778

791-
if ((mode->flags & DRM_MODE_FLAG_INTERLACE) &&
792-
(mode->vdisplay % 2 != 0 ||
793-
mode->vsync_start % 2 != 0 ||
794-
mode->vsync_end % 2 != 0 ||
795-
mode->vtotal % 2 != 1))
796-
return -EINVAL;
797-
798-
/* progressive mode is hard-wired to 312 total lines */
799-
if (!(mode->flags & DRM_MODE_FLAG_INTERLACE) &&
800-
mode->crtc_vtotal != 312)
801-
return -EINVAL;
802-
803779
break;
804780

805781
default:

0 commit comments

Comments
 (0)