2019-09-19 14:43:19 +00:00
|
|
|
From 8dd1e4d73fdbc4a533a58c2c74a72877257c558c Mon Sep 17 00:00:00 2001
|
2019-08-09 17:50:30 +00:00
|
|
|
From: Maxime Ripard <maxime.ripard@bootlin.com>
|
|
|
|
|
Date: Wed, 19 Jun 2019 12:17:52 +0200
|
2019-09-19 14:43:19 +00:00
|
|
|
Subject: [PATCH 738/806] drm/atomic: Add a function to reset connector TV
|
2019-08-09 17:50:30 +00:00
|
|
|
properties
|
|
|
|
|
MIME-Version: 1.0
|
|
|
|
|
Content-Type: text/plain; charset=UTF-8
|
|
|
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
|
|
|
|
|
|
Commit 731514b446fe6748d5a55a3dff202efb45c7d8df upstream.
|
|
|
|
|
Reworked as functions have been moved from drm_atomic_helper.[c|h]
|
|
|
|
|
to drm_atomic_state_helper.[c|h].
|
|
|
|
|
|
|
|
|
|
During the connector reset, if that connector has a TV property, it needs
|
|
|
|
|
to be reset to the value provided on the command line.
|
|
|
|
|
|
|
|
|
|
Provide a helper to do that.
|
|
|
|
|
|
|
|
|
|
Reviewed-by: Noralf Trønnes <noralf@tronnes.org>
|
|
|
|
|
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
|
|
|
|
|
Link: https://patchwork.freedesktop.org/patch/msgid/84a7b657f09303a2850e1cc79e68f623547f3fdd.1560783090.git-series.maxime.ripard@bootlin.com
|
|
|
|
|
---
|
|
|
|
|
drivers/gpu/drm/drm_atomic_helper.c | 18 ++++++++++++++++++
|
|
|
|
|
include/drm/drm_atomic_helper.h | 1 +
|
|
|
|
|
2 files changed, 19 insertions(+)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/gpu/drm/drm_atomic_helper.c
|
|
|
|
|
+++ b/drivers/gpu/drm/drm_atomic_helper.c
|
|
|
|
|
@@ -3737,6 +3737,24 @@ void drm_atomic_helper_connector_reset(s
|
|
|
|
|
EXPORT_SYMBOL(drm_atomic_helper_connector_reset);
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
+ * drm_atomic_helper_connector_tv_reset - Resets TV connector properties
|
|
|
|
|
+ * @connector: DRM connector
|
|
|
|
|
+ *
|
|
|
|
|
+ * Resets the TV-related properties attached to a connector.
|
|
|
|
|
+ */
|
|
|
|
|
+void drm_atomic_helper_connector_tv_reset(struct drm_connector *connector)
|
|
|
|
|
+{
|
|
|
|
|
+ struct drm_cmdline_mode *cmdline = &connector->cmdline_mode;
|
|
|
|
|
+ struct drm_connector_state *state = connector->state;
|
|
|
|
|
+
|
|
|
|
|
+ state->tv.margins.left = cmdline->tv_margins.left;
|
|
|
|
|
+ state->tv.margins.right = cmdline->tv_margins.right;
|
|
|
|
|
+ state->tv.margins.top = cmdline->tv_margins.top;
|
|
|
|
|
+ state->tv.margins.bottom = cmdline->tv_margins.bottom;
|
|
|
|
|
+}
|
|
|
|
|
+EXPORT_SYMBOL(drm_atomic_helper_connector_tv_reset);
|
|
|
|
|
+
|
|
|
|
|
+/**
|
|
|
|
|
* __drm_atomic_helper_connector_duplicate_state - copy atomic connector state
|
|
|
|
|
* @connector: connector object
|
|
|
|
|
* @state: atomic connector state
|
|
|
|
|
--- a/include/drm/drm_atomic_helper.h
|
|
|
|
|
+++ b/include/drm/drm_atomic_helper.h
|
|
|
|
|
@@ -168,6 +168,7 @@ void drm_atomic_helper_plane_destroy_sta
|
|
|
|
|
void __drm_atomic_helper_connector_reset(struct drm_connector *connector,
|
|
|
|
|
struct drm_connector_state *conn_state);
|
|
|
|
|
void drm_atomic_helper_connector_reset(struct drm_connector *connector);
|
|
|
|
|
+void drm_atomic_helper_connector_tv_reset(struct drm_connector *connector);
|
|
|
|
|
void
|
|
|
|
|
__drm_atomic_helper_connector_duplicate_state(struct drm_connector *connector,
|
|
|
|
|
struct drm_connector_state *state);
|
