55 lines
1.9 KiB
Diff
55 lines
1.9 KiB
Diff
From 16349a9b271d331a496a482f46f41a3e1db56891 Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Thu, 16 Jul 2020 12:02:47 +0100
|
|
Subject: [PATCH] drm/vc4: Add DRM_MODE_FLAG_DBLCLK support to
|
|
vc4-fkms
|
|
|
|
480i and several other modes use DRM_MODE_FLAG_DBLCLK and pixel
|
|
replication.
|
|
|
|
Add in flags for that so that FKMS can select CEA modes 6 & 7.
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_firmware_kms.c | 11 ++++++++++-
|
|
1 file changed, 10 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
|
|
@@ -158,6 +158,8 @@ struct set_timings {
|
|
#define TIMINGS_FLAGS_RGB_LIMITED BIT(8)
|
|
/* DVI monitor, therefore disable infoframes. Not set corresponds to HDMI. */
|
|
#define TIMINGS_FLAGS_DVI BIT(9)
|
|
+/* Double clock */
|
|
+#define TIMINGS_FLAGS_DBL_CLK BIT(10)
|
|
};
|
|
|
|
struct mailbox_set_mode {
|
|
@@ -946,6 +948,8 @@ static void vc4_crtc_mode_set_nofb(struc
|
|
|
|
if (mode->flags & DRM_MODE_FLAG_INTERLACE)
|
|
mb.timings.flags |= TIMINGS_FLAGS_INTERLACE;
|
|
+ if (mode->flags & DRM_MODE_FLAG_DBLCLK)
|
|
+ mb.timings.flags |= TIMINGS_FLAGS_DBL_CLK;
|
|
|
|
mb.timings.video_id_code = frame.avi.video_code;
|
|
|
|
@@ -1104,11 +1108,16 @@ vc4_crtc_mode_valid(struct drm_crtc *crt
|
|
*/
|
|
if (fkms->bcm2711 &&
|
|
(vc4_crtc->display_number == 2 || vc4_crtc->display_number == 7) &&
|
|
+ !(mode->flags & DRM_MODE_FLAG_DBLCLK) &&
|
|
((mode->hdisplay | /* active */
|
|
(mode->hsync_start - mode->hdisplay) | /* front porch */
|
|
(mode->hsync_end - mode->hsync_start) | /* sync pulse */
|
|
- (mode->htotal - mode->hsync_end)) & 1)) /* back porch */
|
|
+ (mode->htotal - mode->hsync_end)) & 1)) /* back porch */ {
|
|
+ DRM_DEBUG_KMS("[CRTC:%d] Odd timing rejected %u %u %u %u.\n",
|
|
+ crtc->base.id, mode->hdisplay, mode->hsync_start,
|
|
+ mode->hsync_end, mode->htotal);
|
|
return MODE_H_ILLEGAL;
|
|
+ }
|
|
|
|
return MODE_OK;
|
|
}
|