baad22eed3
As usual these patches were extracted and rebased from the raspberry pi repo: https://github.com/raspberrypi/linux/tree/rpi-4.9.y - Remove led1 from diag.sh for RPi3 since it causes boot issues. - Fix modules.mk typos. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
148 lines
5.4 KiB
Diff
148 lines
5.4 KiB
Diff
From 01ff94b770786a793c08fc7fcbecdd5f859a8958 Mon Sep 17 00:00:00 2001
|
|
From: Boris Brezillon <boris.brezillon@free-electrons.com>
|
|
Date: Fri, 2 Dec 2016 14:48:09 +0100
|
|
Subject: [PATCH] drm: Add TV connector states to drm_connector_state
|
|
|
|
Some generic TV connector properties are exposed in drm_mode_config, but
|
|
they are currently handled independently in each DRM encoder driver.
|
|
|
|
Extend the drm_connector_state to store TV related states, and modify the
|
|
drm_atomic_connector_{set,get}_property() helpers to fill the connector
|
|
state accordingly.
|
|
|
|
Each driver is then responsible for checking and applying the new config
|
|
in its ->atomic_mode_{check,set}() operations.
|
|
|
|
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
|
|
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
|
|
Signed-off-by: Eric Anholt <eric@anholt.net>
|
|
(cherry picked from commit 299a16b163c95fbe1e3b1e142ba9c6ce9dab2c23)
|
|
---
|
|
drivers/gpu/drm/drm_atomic.c | 50 ++++++++++++++++++++++++++++++++++++++++++++
|
|
include/drm/drm_connector.h | 32 ++++++++++++++++++++++++++++
|
|
2 files changed, 82 insertions(+)
|
|
|
|
--- a/drivers/gpu/drm/drm_atomic.c
|
|
+++ b/drivers/gpu/drm/drm_atomic.c
|
|
@@ -989,12 +989,38 @@ int drm_atomic_connector_set_property(st
|
|
* now?) atomic writes to DPMS property:
|
|
*/
|
|
return -EINVAL;
|
|
+ } else if (property == config->tv_select_subconnector_property) {
|
|
+ state->tv.subconnector = val;
|
|
+ } else if (property == config->tv_left_margin_property) {
|
|
+ state->tv.margins.left = val;
|
|
+ } else if (property == config->tv_right_margin_property) {
|
|
+ state->tv.margins.right = val;
|
|
+ } else if (property == config->tv_top_margin_property) {
|
|
+ state->tv.margins.top = val;
|
|
+ } else if (property == config->tv_bottom_margin_property) {
|
|
+ state->tv.margins.bottom = val;
|
|
+ } else if (property == config->tv_mode_property) {
|
|
+ state->tv.mode = val;
|
|
+ } else if (property == config->tv_brightness_property) {
|
|
+ state->tv.brightness = val;
|
|
+ } else if (property == config->tv_contrast_property) {
|
|
+ state->tv.contrast = val;
|
|
+ } else if (property == config->tv_flicker_reduction_property) {
|
|
+ state->tv.flicker_reduction = val;
|
|
+ } else if (property == config->tv_overscan_property) {
|
|
+ state->tv.overscan = val;
|
|
+ } else if (property == config->tv_saturation_property) {
|
|
+ state->tv.saturation = val;
|
|
+ } else if (property == config->tv_hue_property) {
|
|
+ state->tv.hue = val;
|
|
} else if (connector->funcs->atomic_set_property) {
|
|
return connector->funcs->atomic_set_property(connector,
|
|
state, property, val);
|
|
} else {
|
|
return -EINVAL;
|
|
}
|
|
+
|
|
+ return 0;
|
|
}
|
|
EXPORT_SYMBOL(drm_atomic_connector_set_property);
|
|
|
|
@@ -1025,6 +1051,30 @@ drm_atomic_connector_get_property(struct
|
|
*val = (state->crtc) ? state->crtc->base.id : 0;
|
|
} else if (property == config->dpms_property) {
|
|
*val = connector->dpms;
|
|
+ } else if (property == config->tv_select_subconnector_property) {
|
|
+ *val = state->tv.subconnector;
|
|
+ } else if (property == config->tv_left_margin_property) {
|
|
+ *val = state->tv.margins.left;
|
|
+ } else if (property == config->tv_right_margin_property) {
|
|
+ *val = state->tv.margins.right;
|
|
+ } else if (property == config->tv_top_margin_property) {
|
|
+ *val = state->tv.margins.top;
|
|
+ } else if (property == config->tv_bottom_margin_property) {
|
|
+ *val = state->tv.margins.bottom;
|
|
+ } else if (property == config->tv_mode_property) {
|
|
+ *val = state->tv.mode;
|
|
+ } else if (property == config->tv_brightness_property) {
|
|
+ *val = state->tv.brightness;
|
|
+ } else if (property == config->tv_contrast_property) {
|
|
+ *val = state->tv.contrast;
|
|
+ } else if (property == config->tv_flicker_reduction_property) {
|
|
+ *val = state->tv.flicker_reduction;
|
|
+ } else if (property == config->tv_overscan_property) {
|
|
+ *val = state->tv.overscan;
|
|
+ } else if (property == config->tv_saturation_property) {
|
|
+ *val = state->tv.saturation;
|
|
+ } else if (property == config->tv_hue_property) {
|
|
+ *val = state->tv.hue;
|
|
} else if (connector->funcs->atomic_get_property) {
|
|
return connector->funcs->atomic_get_property(connector,
|
|
state, property, val);
|
|
--- a/include/drm/drm_connector.h
|
|
+++ b/include/drm/drm_connector.h
|
|
@@ -194,10 +194,40 @@ int drm_display_info_set_bus_formats(str
|
|
unsigned int num_formats);
|
|
|
|
/**
|
|
+ * struct drm_tv_connector_state - TV connector related states
|
|
+ * @subconnector: selected subconnector
|
|
+ * @margins: left/right/top/bottom margins
|
|
+ * @mode: TV mode
|
|
+ * @brightness: brightness in percent
|
|
+ * @contrast: contrast in percent
|
|
+ * @flicker_reduction: flicker reduction in percent
|
|
+ * @overscan: overscan in percent
|
|
+ * @saturation: saturation in percent
|
|
+ * @hue: hue in percent
|
|
+ */
|
|
+struct drm_tv_connector_state {
|
|
+ enum drm_mode_subconnector subconnector;
|
|
+ struct {
|
|
+ unsigned int left;
|
|
+ unsigned int right;
|
|
+ unsigned int top;
|
|
+ unsigned int bottom;
|
|
+ } margins;
|
|
+ unsigned int mode;
|
|
+ unsigned int brightness;
|
|
+ unsigned int contrast;
|
|
+ unsigned int flicker_reduction;
|
|
+ unsigned int overscan;
|
|
+ unsigned int saturation;
|
|
+ unsigned int hue;
|
|
+};
|
|
+
|
|
+/**
|
|
* struct drm_connector_state - mutable connector state
|
|
* @connector: backpointer to the connector
|
|
* @best_encoder: can be used by helpers and drivers to select the encoder
|
|
* @state: backpointer to global drm_atomic_state
|
|
+ * @tv: TV connector state
|
|
*/
|
|
struct drm_connector_state {
|
|
struct drm_connector *connector;
|
|
@@ -213,6 +243,8 @@ struct drm_connector_state {
|
|
struct drm_encoder *best_encoder;
|
|
|
|
struct drm_atomic_state *state;
|
|
+
|
|
+ struct drm_tv_connector_state tv;
|
|
};
|
|
|
|
/**
|