mirror of https://github.com/hak5/openwrt.git
82 lines
2.4 KiB
Diff
82 lines
2.4 KiB
Diff
From 6261047a83258900e57a0a699ec7954360c6e7f3 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime.ripard@bootlin.com>
|
|
Date: Wed, 19 Jun 2019 12:17:51 +0200
|
|
Subject: [PATCH 736/806] drm/connector: Introduce a TV margins structure
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Commit 22045e8e52bd802f743f0471242782fc3b479707 upstream.
|
|
|
|
The TV margins has been defined as a structure inside the
|
|
drm_connector_state structure so far. However, we will need it in other
|
|
structures as well, so let's move that structure definition so that it can
|
|
be reused.
|
|
|
|
Reviewed-by: Noralf Trønnes <noralf@tronnes.org>
|
|
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
|
|
Link: https://patchwork.freedesktop.org/patch/msgid/38b773b03f15ec7a135cdf8f7db669e5ada20cf2.1560783090.git-series.maxime.ripard@bootlin.com
|
|
---
|
|
include/drm/drm_connector.h | 41 +++++++++++++++++++++++++++----------
|
|
1 file changed, 30 insertions(+), 11 deletions(-)
|
|
|
|
--- a/include/drm/drm_connector.h
|
|
+++ b/include/drm/drm_connector.h
|
|
@@ -344,13 +344,37 @@ int drm_display_info_set_bus_formats(str
|
|
unsigned int num_formats);
|
|
|
|
/**
|
|
+ * struct drm_connector_tv_margins - TV connector related margins
|
|
+ *
|
|
+ * Describes the margins in pixels to put around the image on TV
|
|
+ * connectors to deal with overscan.
|
|
+ */
|
|
+struct drm_connector_tv_margins {
|
|
+ /**
|
|
+ * @bottom: Bottom margin in pixels.
|
|
+ */
|
|
+ unsigned int bottom;
|
|
+
|
|
+ /**
|
|
+ * @left: Left margin in pixels.
|
|
+ */
|
|
+ unsigned int left;
|
|
+
|
|
+ /**
|
|
+ * @right: Right margin in pixels.
|
|
+ */
|
|
+ unsigned int right;
|
|
+
|
|
+ /**
|
|
+ * @top: Top margin in pixels.
|
|
+ */
|
|
+ unsigned int top;
|
|
+};
|
|
+
|
|
+/**
|
|
* struct drm_tv_connector_state - TV connector related states
|
|
* @subconnector: selected subconnector
|
|
- * @margins: margins (all margins are expressed in pixels)
|
|
- * @margins.left: left margin
|
|
- * @margins.right: right margin
|
|
- * @margins.top: top margin
|
|
- * @margins.bottom: bottom margin
|
|
+ * @margins: TV margins
|
|
* @mode: TV mode
|
|
* @brightness: brightness in percent
|
|
* @contrast: contrast in percent
|
|
@@ -361,12 +385,7 @@ int drm_display_info_set_bus_formats(str
|
|
*/
|
|
struct drm_tv_connector_state {
|
|
enum drm_mode_subconnector subconnector;
|
|
- struct {
|
|
- unsigned int left;
|
|
- unsigned int right;
|
|
- unsigned int top;
|
|
- unsigned int bottom;
|
|
- } margins;
|
|
+ struct drm_connector_tv_margins margins;
|
|
unsigned int mode;
|
|
unsigned int brightness;
|
|
unsigned int contrast;
|