diff options
| author | Álvaro Fernández Rojas <noltari@gmail.com> | 2020-02-04 19:02:53 +0100 |
|---|---|---|
| committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2020-02-04 19:14:13 +0100 |
| commit | 84d555aa74434392b682fd9eb0fa701c89a046d6 (patch) | |
| tree | bcc0a9bf058757da14054bce61a8cb8b8c9cd873 /target/linux/brcm2708/patches-4.19/950-0542-drm-vc4-Support-the-VEC-in-FKMS.patch | |
| parent | 953973c2991e8640549a55df7a0574a1abac8644 (diff) | |
| download | upstream-84d555aa74434392b682fd9eb0fa701c89a046d6.tar.gz upstream-84d555aa74434392b682fd9eb0fa701c89a046d6.tar.bz2 upstream-84d555aa74434392b682fd9eb0fa701c89a046d6.zip | |
brcm2708: update to latest patches from RPi foundation
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.19/950-0542-drm-vc4-Support-the-VEC-in-FKMS.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-4.19/950-0542-drm-vc4-Support-the-VEC-in-FKMS.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.19/950-0542-drm-vc4-Support-the-VEC-in-FKMS.patch b/target/linux/brcm2708/patches-4.19/950-0542-drm-vc4-Support-the-VEC-in-FKMS.patch new file mode 100644 index 0000000000..29db708769 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0542-drm-vc4-Support-the-VEC-in-FKMS.patch @@ -0,0 +1,62 @@ +From 82ef7a95f5ae86df811253d58d93ca4fb2cbd45a 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] 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); |