mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-23 15:21:39 +00:00
f49c6f8e2b
1: update meson 4K support patches: 2, HDMI i2s improvement patches: 3, update vdec patches: 4, update meson audio patches: 5, add meson crypto engine driver 6, remove disabled patches: 7 remove unknown patch or no need 8, remove merged patches: 9, remove unknown patches from khadas should be covered by patches set 2 10, rename patches for better grouping 11, update kernel config accordingly Signed-off-by: Zhang Ning <832666+zhangn1985@users.noreply.github.com>
112 lines
3.9 KiB
Diff
112 lines
3.9 KiB
Diff
From 057c57825bba67e0d72c19d76a11de9da803db30 Mon Sep 17 00:00:00 2001
|
|
From: Neil Armstrong <narmstrong@baylibre.com>
|
|
Date: Mon, 20 May 2019 15:37:50 +0200
|
|
Subject: [PATCH 2/5] drm/bridge: add encoder support to specify bridge input
|
|
format
|
|
|
|
This patch adds a new format_set() callback to the bridge ops permitting
|
|
the encoder to specify the new input format and encoding.
|
|
|
|
This allows supporting the very specific HDMI2.0 YUV420 output mode
|
|
when the bridge cannot convert from RGB or YUV444 to YUV420.
|
|
|
|
In this case, the encode must downsample before the bridge and must
|
|
specify the bridge the new input bus format differs.
|
|
|
|
This will also help supporting the YUV420 mode where the bridge cannot
|
|
downsample, and also support 10bit, 12bit and 16bit output modes
|
|
when the bridge cannot convert between different bit depths.
|
|
|
|
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
|
|
Reviewed-by: Jernej Skrabec <jernej.skrabec@siol.net>
|
|
---
|
|
drivers/gpu/drm/drm_bridge.c | 35 +++++++++++++++++++++++++++++++++++
|
|
include/drm/drm_bridge.h | 19 +++++++++++++++++++
|
|
2 files changed, 54 insertions(+)
|
|
|
|
diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c
|
|
index cba537c99e43..a4458dbfe302 100644
|
|
--- a/drivers/gpu/drm/drm_bridge.c
|
|
+++ b/drivers/gpu/drm/drm_bridge.c
|
|
@@ -307,6 +307,41 @@ void drm_bridge_mode_set(struct drm_bridge *bridge,
|
|
}
|
|
EXPORT_SYMBOL(drm_bridge_mode_set);
|
|
|
|
+/**
|
|
+ * drm_bridge_format_set - setup with proposed input format and encoding for
|
|
+ * all bridges in the encoder chain
|
|
+ * @bridge: bridge control structure
|
|
+ * @input_bus_format: proposed input bus format for the bridge
|
|
+ * @input_encoding: proposed input encoding for this bridge
|
|
+ *
|
|
+ * Calls &drm_bridge_funcs.format_set op for all the bridges in the
|
|
+ * encoder chain, starting from the first bridge to the last.
|
|
+ *
|
|
+ * Note: the bridge passed should be the one closest to the encoder
|
|
+ *
|
|
+ * RETURNS:
|
|
+ * true on success, false if one of the bridge cannot handle the format
|
|
+ */
|
|
+bool drm_bridge_format_set(struct drm_bridge *bridge,
|
|
+ const u32 input_bus_format,
|
|
+ const u32 input_encoding)
|
|
+{
|
|
+ bool ret = true;
|
|
+
|
|
+ if (!bridge)
|
|
+ return true;
|
|
+
|
|
+ if (bridge->funcs->format_set)
|
|
+ ret = bridge->funcs->format_set(bridge, input_bus_format,
|
|
+ input_encoding);
|
|
+ if (!ret)
|
|
+ return ret;
|
|
+
|
|
+ return drm_bridge_format_set(bridge->next, input_bus_format,
|
|
+ input_encoding);
|
|
+}
|
|
+EXPORT_SYMBOL(drm_bridge_format_set);
|
|
+
|
|
/**
|
|
* drm_bridge_pre_enable - prepares for enabling all
|
|
* bridges in the encoder chain
|
|
diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h
|
|
index 7616f6562fe4..161026c9b908 100644
|
|
--- a/include/drm/drm_bridge.h
|
|
+++ b/include/drm/drm_bridge.h
|
|
@@ -198,6 +198,22 @@ struct drm_bridge_funcs {
|
|
void (*mode_set)(struct drm_bridge *bridge,
|
|
const struct drm_display_mode *mode,
|
|
const struct drm_display_mode *adjusted_mode);
|
|
+
|
|
+ /**
|
|
+ * @format_set:
|
|
+ *
|
|
+ * This callback should configure the bridge for the given input bus
|
|
+ * format and encoding. It is called after the @format_set callback
|
|
+ * for the preceding element in the display pipeline has been called
|
|
+ * already. If the bridge is the first element then this would be
|
|
+ * &drm_encoder_helper_funcs.format_set. The display pipe (i.e.
|
|
+ * clocks and timing signals) is off when this function is called.
|
|
+ *
|
|
+ * @returns: true in success, false is a bridge refuses the format
|
|
+ */
|
|
+ bool (*format_set)(struct drm_bridge *bridge,
|
|
+ const u32 input_bus_format,
|
|
+ const u32 input_encoding);
|
|
/**
|
|
* @pre_enable:
|
|
*
|
|
@@ -416,6 +432,9 @@ void drm_bridge_post_disable(struct drm_bridge *bridge);
|
|
void drm_bridge_mode_set(struct drm_bridge *bridge,
|
|
const struct drm_display_mode *mode,
|
|
const struct drm_display_mode *adjusted_mode);
|
|
+bool drm_bridge_format_set(struct drm_bridge *bridge,
|
|
+ const u32 input_bus_format,
|
|
+ const u32 input_encoding);
|
|
void drm_bridge_pre_enable(struct drm_bridge *bridge);
|
|
void drm_bridge_enable(struct drm_bridge *bridge);
|
|
|
|
--
|
|
2.20.1
|
|
|