mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 17:48:58 +00:00
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
57 lines
1.9 KiB
Diff
57 lines
1.9 KiB
Diff
From bbd8dd64c1083232f3da8e097207a5b539ab91c9 Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Thu, 25 Nov 2021 14:45:33 +0000
|
|
Subject: [PATCH] drm/vc4: Add support for composite syncs to vc4_dpi
|
|
|
|
The hardware can combine H&V syncs onto the output enable line
|
|
as composite syncs, so add the relevant configuration to do that.
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_dpi.c | 25 ++++++++++++++++---------
|
|
1 file changed, 16 insertions(+), 9 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_dpi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_dpi.c
|
|
@@ -131,7 +131,7 @@ static void vc4_dpi_encoder_enable(struc
|
|
struct vc4_dpi *dpi = vc4_encoder->dpi;
|
|
struct drm_connector_list_iter conn_iter;
|
|
struct drm_connector *connector = NULL, *connector_scan;
|
|
- u32 dpi_c = DPI_ENABLE | DPI_OUTPUT_ENABLE_MODE;
|
|
+ u32 dpi_c = DPI_ENABLE;
|
|
int ret;
|
|
|
|
/* Look up the connector attached to DPI so we can get the
|
|
@@ -202,15 +202,22 @@ static void vc4_dpi_encoder_enable(struc
|
|
dpi_c |= VC4_SET_FIELD(DPI_FORMAT_18BIT_666_RGB_1, DPI_FORMAT);
|
|
}
|
|
|
|
- if (mode->flags & DRM_MODE_FLAG_NHSYNC)
|
|
- dpi_c |= DPI_HSYNC_INVERT;
|
|
- else if (!(mode->flags & DRM_MODE_FLAG_PHSYNC))
|
|
- dpi_c |= DPI_HSYNC_DISABLE;
|
|
-
|
|
- if (mode->flags & DRM_MODE_FLAG_NVSYNC)
|
|
- dpi_c |= DPI_VSYNC_INVERT;
|
|
- else if (!(mode->flags & DRM_MODE_FLAG_PVSYNC))
|
|
- dpi_c |= DPI_VSYNC_DISABLE;
|
|
+ if (mode->flags & DRM_MODE_FLAG_CSYNC) {
|
|
+ if (mode->flags & DRM_MODE_FLAG_NCSYNC)
|
|
+ dpi_c |= DPI_OUTPUT_ENABLE_INVERT;
|
|
+ } else {
|
|
+ dpi_c |= DPI_OUTPUT_ENABLE_MODE;
|
|
+
|
|
+ if (mode->flags & DRM_MODE_FLAG_NHSYNC)
|
|
+ dpi_c |= DPI_HSYNC_INVERT;
|
|
+ else if (!(mode->flags & DRM_MODE_FLAG_PHSYNC))
|
|
+ dpi_c |= DPI_HSYNC_DISABLE;
|
|
+
|
|
+ if (mode->flags & DRM_MODE_FLAG_NVSYNC)
|
|
+ dpi_c |= DPI_VSYNC_INVERT;
|
|
+ else if (!(mode->flags & DRM_MODE_FLAG_PVSYNC))
|
|
+ dpi_c |= DPI_VSYNC_DISABLE;
|
|
+ }
|
|
|
|
DPI_WRITE(DPI_C, dpi_c);
|
|
|