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>
96 lines
3.5 KiB
Diff
96 lines
3.5 KiB
Diff
From 19313cfed297308b9cc3b75eb68cdd0d2216cd92 Mon Sep 17 00:00:00 2001
|
|
From: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
|
|
Date: Thu, 15 Feb 2024 14:29:07 +0000
|
|
Subject: [PATCH 0923/1085] drm: Add DRM_MODE_TV_MODE_MONOCHROME
|
|
|
|
Add this as a value for enum_drm_connector_tv_mode, represented
|
|
by the string "Mono", to generate video with standard timings
|
|
but no colour encoding or bursts. Define it to have no pedestal
|
|
(since only NTSC-M calls for a pedestal).
|
|
|
|
Change default mode creation to acommodate the new tv_mode value
|
|
which comprises both 525-line and 625-line formats.
|
|
|
|
Signed-off-by: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
|
|
---
|
|
drivers/gpu/drm/drm_connector.c | 7 +++++++
|
|
drivers/gpu/drm/drm_modes.c | 5 ++++-
|
|
drivers/gpu/drm/drm_probe_helper.c | 5 +++--
|
|
include/drm/drm_connector.h | 7 +++++++
|
|
4 files changed, 21 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/drm_connector.c
|
|
+++ b/drivers/gpu/drm/drm_connector.c
|
|
@@ -1049,6 +1049,7 @@ static const struct drm_prop_enum_list d
|
|
{ DRM_MODE_TV_MODE_PAL_M, "PAL-M" },
|
|
{ DRM_MODE_TV_MODE_PAL_N, "PAL-N" },
|
|
{ DRM_MODE_TV_MODE_SECAM, "SECAM" },
|
|
+ { DRM_MODE_TV_MODE_MONOCHROME, "Mono" },
|
|
};
|
|
DRM_ENUM_NAME_FN(drm_get_tv_mode_name, drm_tv_mode_enum_list)
|
|
|
|
@@ -1735,6 +1736,12 @@ EXPORT_SYMBOL(drm_connector_attach_dp_su
|
|
* TV Mode is CCIR System B (aka 625-lines) together with
|
|
* the SECAM Color Encoding.
|
|
*
|
|
+ * Mono:
|
|
+ *
|
|
+ * Use timings appropriate to the DRM mode, including
|
|
+ * equalizing pulses for a 525-line or 625-line mode,
|
|
+ * with no pedestal or color encoding.
|
|
+ *
|
|
* Drivers can set up this property by calling
|
|
* drm_mode_create_tv_properties().
|
|
*/
|
|
--- a/drivers/gpu/drm/drm_modes.c
|
|
+++ b/drivers/gpu/drm/drm_modes.c
|
|
@@ -530,7 +530,8 @@ static int fill_analog_mode(struct drm_d
|
|
* @interlace: whether to compute an interlaced mode
|
|
*
|
|
* This function creates a struct drm_display_mode instance suited for
|
|
- * an analog TV output, for one of the usual analog TV mode.
|
|
+ * an analog TV output, for one of the usual analog TV modes. Where
|
|
+ * this is DRM_MODE_TV_MODE_MONOCHROME, a 625-line mode will be created.
|
|
*
|
|
* Note that @hdisplay is larger than the usual constraints for the PAL
|
|
* and NTSC timings, and we'll choose to ignore most timings constraints
|
|
@@ -568,6 +569,8 @@ struct drm_display_mode *drm_analog_tv_m
|
|
case DRM_MODE_TV_MODE_PAL_N:
|
|
fallthrough;
|
|
case DRM_MODE_TV_MODE_SECAM:
|
|
+ fallthrough;
|
|
+ case DRM_MODE_TV_MODE_MONOCHROME:
|
|
analog = DRM_MODE_ANALOG_PAL;
|
|
break;
|
|
|
|
--- a/drivers/gpu/drm/drm_probe_helper.c
|
|
+++ b/drivers/gpu/drm/drm_probe_helper.c
|
|
@@ -1267,8 +1267,9 @@ int drm_connector_helper_tv_get_modes(st
|
|
for (i = 0; i < tv_mode_property->num_values; i++)
|
|
supported_tv_modes |= BIT(tv_mode_property->values[i]);
|
|
|
|
- if ((supported_tv_modes & ntsc_modes) &&
|
|
- (supported_tv_modes & pal_modes)) {
|
|
+ if (((supported_tv_modes & ntsc_modes) &&
|
|
+ (supported_tv_modes & pal_modes)) ||
|
|
+ (supported_tv_modes & BIT(DRM_MODE_TV_MODE_MONOCHROME))) {
|
|
uint64_t default_mode;
|
|
|
|
if (drm_object_property_get_default_value(&connector->base,
|
|
--- a/include/drm/drm_connector.h
|
|
+++ b/include/drm/drm_connector.h
|
|
@@ -201,6 +201,13 @@ enum drm_connector_tv_mode {
|
|
DRM_MODE_TV_MODE_SECAM,
|
|
|
|
/**
|
|
+ * @DRM_MODE_TV_MODE_MONOCHROME: Use timings appropriate to
|
|
+ * the DRM mode, including equalizing pulses for a 525-line
|
|
+ * or 625-line mode, with no pedestal or color encoding.
|
|
+ */
|
|
+ DRM_MODE_TV_MODE_MONOCHROME,
|
|
+
|
|
+ /**
|
|
* @DRM_MODE_TV_MODE_MAX: Number of analog TV output modes.
|
|
*
|
|
* Internal implementation detail; this is not uABI.
|