d6d8851d12
Manually rebased:
bcm27xx/patches-5.15/950-0421-Support-RPi-DPI-interface-in-mode6-for-18-bit-color.patch
bcm27xx/patches-5.15/950-0706-media-i2c-imx219-Scale-the-pixel-clock-rate-for-the-.patch
ramips/patches-5.15/810-uvc-add-iPassion-iP2970-support.patch
Removed upstreamed:
bcm27xx/patches-5.15/950-0707-drm-vc4-For-DPI-MEDIA_BUS_FMT_RGB565_1X16-is-mode-1-.patch[1]
bcm27xx/patches-5.15/950-0596-drm-vc4-dpi-Add-option-for-inverting-pixel-clock-and.patch[2]
ipq807x/0006-v5.16-arm64-dts-qcom-Fix-IPQ8074-PCIe-PHY-nodes.patch [3]
ipq807x/0034-v6.1-arm64-dts-qcom-ipq8074-fix-PCIe-PHY-serdes-size.patch [4]
ipq807x/0103-arm64-dts-qcom-ipq8074-fix-Gen2-PCIe-QMP-PHY.patch [5]
ipq807x/0104-arm64-dts-qcom-ipq8074-fix-Gen3-PCIe-QMP-PHY.patch [6]
ipq807x/0105-arm64-dts-qcom-ipq8074-correct-Gen2-PCIe-ranges.patch [7]
ipq807x/0108-arm64-dts-qcom-ipq8074-fix-Gen3-PCIe-node.patch [8]
ipq807x/0109-arm64-dts-qcom-ipq8074-correct-PCIe-QMP-PHY-output-c.patch [9]
ipq807x/0132-arm64-dts-qcom-ipq8074-correct-USB3-QMP-PHY-s-clock-.patch [10]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.99&id=d2991e6b30020e286f2dd9d3b4f43548c547caa6
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/drivers/gpu/drm/vc4/vc4_dpi.c?h=v5.15.100&id=8e04aaffb6de5f1ae61de7b671c1531172ccf429
3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/arch/arm64/boot/dts/qcom/ipq8074.dtsi?h=v5.15.99&id=a55a645aa303a3f7ec37db69822d5420657626da
4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/arch/arm64/boot/dts/qcom/ipq8074.dtsi?h=v5.15.99&id=d9df682bcea57fa25f37bbf17eae56fa05662635
5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/arch/arm64/boot/dts/qcom/ipq8074.dtsi?h=v5.15.99&id=7e6eeb5fb3aa9e5feffdb6e137dcc06f5f6410e1
6. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/arch/arm64/boot/dts/qcom/ipq8074.dtsi?h=v5.15.99&id=e88204931d9a60634cd50bbc679f045439c4b91d
7. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/arch/arm64/boot/dts/qcom/ipq8074.dtsi?h=v5.15.99&id=1563af0f28afd3b6d64ac79a2aecced3969c90bf
8. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/arch/arm64/boot/dts/qcom/ipq8074.dtsi?h=v5.15.99&id=feb8c71f015d416f1afe90e1f62cf51e47376c67
9. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/arch/arm64/boot/dts/qcom/ipq8074.dtsi?h=v5.15.99&id=69c7a270357a7d50ffd3471b14c60250041200e3
10. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/arch/arm64/boot/dts/qcom/ipq8074.dtsi?h=v5.15.99&id=dd3d021ae5471d98adf81f1e897431c8657d0a18
Build system: x86_64
Build-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3
Run-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3
Signed-off-by: John Audia <therealgraysky@proton.me>
Tested-by: Robert Marko <robimarko@gmail.com> #ipq807x/Dynalink WRX36
Tested-by: Stefan Lippers-Hollmann <s.l-h@gmx.de> #ipq807x/ax3600, x86_64/FW-7543B, ath79/tl-wdr3600, ipq806x/g10, ipq806x/nbg6817
101 lines
3.9 KiB
Diff
101 lines
3.9 KiB
Diff
From d27c36f9beed7d6a9d19ea1d642a7fb898eb6d95 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Wed, 14 Apr 2021 16:21:08 +0200
|
|
Subject: [PATCH] drm/edid: Rename drm_hdmi_avi_infoframe_colorspace to
|
|
_colorimetry
|
|
|
|
The drm_hdmi_avi_infoframe_colorspace() function actually sets the
|
|
colorimetry and extended_colorimetry fields in the hdmi_avi_infoframe
|
|
structure with DRM_MODE_COLORIMETRY_* values.
|
|
|
|
To make things worse, the hdmi_avi_infoframe structure also has a
|
|
colorspace field used to signal whether an RGB or YUV output is being
|
|
used.
|
|
|
|
Let's remove the inconsistency and allow for the colorspace usage by
|
|
renaming the function.
|
|
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/gpu/drm/drm_edid.c | 8 ++++----
|
|
drivers/gpu/drm/i915/display/intel_hdmi.c | 2 +-
|
|
drivers/gpu/drm/i915/display/intel_lspcon.c | 2 +-
|
|
drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +-
|
|
include/drm/drm_edid.h | 4 ++--
|
|
5 files changed, 9 insertions(+), 9 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/drm_edid.c
|
|
+++ b/drivers/gpu/drm/drm_edid.c
|
|
@@ -5746,13 +5746,13 @@ static const u32 hdmi_colorimetry_val[]
|
|
#undef ACE
|
|
|
|
/**
|
|
- * drm_hdmi_avi_infoframe_colorspace() - fill the HDMI AVI infoframe
|
|
- * colorspace information
|
|
+ * drm_hdmi_avi_infoframe_colorimetry() - fill the HDMI AVI infoframe
|
|
+ * colorimetry information
|
|
* @frame: HDMI AVI infoframe
|
|
* @conn_state: connector state
|
|
*/
|
|
void
|
|
-drm_hdmi_avi_infoframe_colorspace(struct hdmi_avi_infoframe *frame,
|
|
+drm_hdmi_avi_infoframe_colorimetry(struct hdmi_avi_infoframe *frame,
|
|
const struct drm_connector_state *conn_state)
|
|
{
|
|
u32 colorimetry_val;
|
|
@@ -5771,7 +5771,7 @@ drm_hdmi_avi_infoframe_colorspace(struct
|
|
frame->extended_colorimetry = (colorimetry_val >> 2) &
|
|
EXTENDED_COLORIMETRY_MASK;
|
|
}
|
|
-EXPORT_SYMBOL(drm_hdmi_avi_infoframe_colorspace);
|
|
+EXPORT_SYMBOL(drm_hdmi_avi_infoframe_colorimetry);
|
|
|
|
/**
|
|
* drm_hdmi_avi_infoframe_quant_range() - fill the HDMI AVI infoframe
|
|
--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
|
|
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
|
|
@@ -730,7 +730,7 @@ intel_hdmi_compute_avi_infoframe(struct
|
|
else
|
|
frame->colorspace = HDMI_COLORSPACE_RGB;
|
|
|
|
- drm_hdmi_avi_infoframe_colorspace(frame, conn_state);
|
|
+ drm_hdmi_avi_infoframe_colorimetry(frame, conn_state);
|
|
|
|
/* nonsense combination */
|
|
drm_WARN_ON(encoder->base.dev, crtc_state->limited_color_range &&
|
|
--- a/drivers/gpu/drm/i915/display/intel_lspcon.c
|
|
+++ b/drivers/gpu/drm/i915/display/intel_lspcon.c
|
|
@@ -537,7 +537,7 @@ void lspcon_set_infoframes(struct intel_
|
|
frame.avi.colorspace = HDMI_COLORSPACE_RGB;
|
|
|
|
/* Set the Colorspace as per the HDMI spec */
|
|
- drm_hdmi_avi_infoframe_colorspace(&frame.avi, conn_state);
|
|
+ drm_hdmi_avi_infoframe_colorimetry(&frame.avi, conn_state);
|
|
|
|
/* nonsense combination */
|
|
drm_WARN_ON(encoder->base.dev, crtc_state->limited_color_range &&
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
@@ -517,7 +517,7 @@ static void vc4_hdmi_set_avi_infoframe(s
|
|
vc4_encoder->limited_rgb_range ?
|
|
HDMI_QUANTIZATION_RANGE_LIMITED :
|
|
HDMI_QUANTIZATION_RANGE_FULL);
|
|
- drm_hdmi_avi_infoframe_colorspace(&frame.avi, cstate);
|
|
+ drm_hdmi_avi_infoframe_colorimetry(&frame.avi, cstate);
|
|
drm_hdmi_avi_infoframe_bars(&frame.avi, cstate);
|
|
|
|
vc4_hdmi_write_infoframe(encoder, &frame);
|
|
--- a/include/drm/drm_edid.h
|
|
+++ b/include/drm/drm_edid.h
|
|
@@ -401,8 +401,8 @@ drm_hdmi_vendor_infoframe_from_display_m
|
|
const struct drm_display_mode *mode);
|
|
|
|
void
|
|
-drm_hdmi_avi_infoframe_colorspace(struct hdmi_avi_infoframe *frame,
|
|
- const struct drm_connector_state *conn_state);
|
|
+drm_hdmi_avi_infoframe_colorimetry(struct hdmi_avi_infoframe *frame,
|
|
+ const struct drm_connector_state *conn_state);
|
|
|
|
void
|
|
drm_hdmi_avi_infoframe_bars(struct hdmi_avi_infoframe *frame,
|