1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
From 54ffea83f539f01436acaa73df648a8279c77918 Mon Sep 17 00:00:00 2001
From: Dave Stevenson <dave.stevenson@raspberrypi.org>
Date: Fri, 24 May 2019 17:59:01 +0100
Subject: [PATCH 618/773] drm/vc4: Support the VEC in FKMS
Extends the DPI/DSI support to also report the VEC output
which supports interlacing too.
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
---
drivers/gpu/drm/vc4/vc4_firmware_kms.c | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
--- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
+++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
@@ -125,6 +125,7 @@ struct set_timings {
#define TIMINGS_FLAGS_H_SYNC_NEG 0
#define TIMINGS_FLAGS_V_SYNC_POS BIT(1)
#define TIMINGS_FLAGS_V_SYNC_NEG 0
+#define TIMINGS_FLAGS_INTERLACE BIT(2)
#define TIMINGS_FLAGS_ASPECT_MASK GENMASK(7, 4)
#define TIMINGS_FLAGS_ASPECT_NONE (0 << 4)
@@ -1047,6 +1048,12 @@ static int vc4_fkms_lcd_connector_get_mo
fw_mode.flags |= DRM_MODE_FLAG_PVSYNC;
else
fw_mode.flags |= DRM_MODE_FLAG_NVSYNC;
+ if (mb.timings.flags & TIMINGS_FLAGS_V_SYNC_POS)
+ fw_mode.flags |= DRM_MODE_FLAG_PVSYNC;
+ else
+ fw_mode.flags |= DRM_MODE_FLAG_NVSYNC;
+ if (mb.timings.flags & TIMINGS_FLAGS_INTERLACE)
+ fw_mode.flags |= DRM_MODE_FLAG_INTERLACE;
fw_mode.base.type = DRM_MODE_OBJECT_MODE;
@@ -1133,17 +1140,24 @@ vc4_fkms_connector_init(struct drm_devic
DRM_MODE_CONNECTOR_DSI);
drm_connector_helper_add(connector,
&vc4_fkms_lcd_conn_helper_funcs);
+ connector->interlace_allowed = 0;
+ } else if (fkms_connector->display_type == DRM_MODE_ENCODER_TVDAC) {
+ drm_connector_init(dev, connector, &vc4_fkms_connector_funcs,
+ DRM_MODE_CONNECTOR_Composite);
+ drm_connector_helper_add(connector,
+ &vc4_fkms_lcd_conn_helper_funcs);
+ connector->interlace_allowed = 1;
} else {
drm_connector_init(dev, connector, &vc4_fkms_connector_funcs,
DRM_MODE_CONNECTOR_HDMIA);
drm_connector_helper_add(connector,
&vc4_fkms_connector_helper_funcs);
+ connector->interlace_allowed = 0;
}
connector->polled = (DRM_CONNECTOR_POLL_CONNECT |
DRM_CONNECTOR_POLL_DISCONNECT);
- connector->interlace_allowed = 0;
connector->doublescan_allowed = 0;
drm_connector_attach_encoder(connector, encoder);
|
