forked from Openwrt/openwrt
8c405cdccc
The patches were generated from the RPi repo with the following command: git format-patch v6.6.34..rpi-6.1.y Some patches needed rebasing and, as usual, the applied and reverted, wireless drivers, Github workflows, READMEs and defconfigs patches were removed. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
69 lines
2.1 KiB
Diff
69 lines
2.1 KiB
Diff
From 2f04da8b66d1124c4cf9c1fd9733821801a01a5d Mon Sep 17 00:00:00 2001
|
|
From: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
|
|
Date: Thu, 15 Jul 2021 01:08:11 +0200
|
|
Subject: [PATCH 0012/1085] drm/vc4: Make VEC progressive modes readily
|
|
accessible
|
|
|
|
Add predefined modelines for the 240p (NTSC) and 288p (PAL) progressive
|
|
modes, and report them through vc4_vec_connector_get_modes().
|
|
|
|
Signed-off-by: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_vec.c | 36 ++++++++++++++++++++++++++++++++++-
|
|
1 file changed, 35 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_vec.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_vec.c
|
|
@@ -273,6 +273,18 @@ static const struct debugfs_reg32 vec_re
|
|
VC4_REG32(VEC_DAC_MISC),
|
|
};
|
|
|
|
+static const struct drm_display_mode drm_mode_240p = {
|
|
+ DRM_MODE("720x240", DRM_MODE_TYPE_DRIVER, 13500,
|
|
+ 720, 720 + 14, 720 + 14 + 64, 720 + 14 + 64 + 60, 0,
|
|
+ 240, 240 + 3, 240 + 3 + 3, 262, 0, 0)
|
|
+};
|
|
+
|
|
+static const struct drm_display_mode drm_mode_288p = {
|
|
+ DRM_MODE("720x288", DRM_MODE_TYPE_DRIVER, 13500,
|
|
+ 720, 720 + 20, 720 + 20 + 64, 720 + 20 + 64 + 60, 0,
|
|
+ 288, 288 + 2, 288 + 2 + 3, 312, 0, 0)
|
|
+};
|
|
+
|
|
static const struct vc4_vec_tv_mode vc4_vec_tv_modes[] = {
|
|
{
|
|
.mode = DRM_MODE_TV_MODE_NTSC,
|
|
@@ -507,9 +519,31 @@ static const struct drm_connector_funcs
|
|
.atomic_set_property = vc4_vec_connector_set_property,
|
|
};
|
|
|
|
+static int vc4_vec_connector_get_modes(struct drm_connector *connector)
|
|
+{
|
|
+ struct drm_display_mode *mode;
|
|
+ int count = drm_connector_helper_tv_get_modes(connector);
|
|
+
|
|
+ mode = drm_mode_duplicate(connector->dev, &drm_mode_240p);
|
|
+ if (!mode)
|
|
+ return -ENOMEM;
|
|
+
|
|
+ drm_mode_probed_add(connector, mode);
|
|
+ count++;
|
|
+
|
|
+ mode = drm_mode_duplicate(connector->dev, &drm_mode_288p);
|
|
+ if (!mode)
|
|
+ return -ENOMEM;
|
|
+
|
|
+ drm_mode_probed_add(connector, mode);
|
|
+ count++;
|
|
+
|
|
+ return count;
|
|
+}
|
|
+
|
|
static const struct drm_connector_helper_funcs vc4_vec_connector_helper_funcs = {
|
|
.atomic_check = drm_atomic_helper_connector_tv_check,
|
|
- .get_modes = drm_connector_helper_tv_get_modes,
|
|
+ .get_modes = vc4_vec_connector_get_modes,
|
|
};
|
|
|
|
static int vc4_vec_connector_init(struct drm_device *dev, struct vc4_vec *vec)
|