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
96 lines
2.7 KiB
Diff
96 lines
2.7 KiB
Diff
From b6d1141860db42137660a44a8c1713a33e6e5833 Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Wed, 21 Oct 2020 18:34:56 +0100
|
|
Subject: [PATCH] drm/vc4: Add all the HDMI registers into the debugfs
|
|
dumps
|
|
|
|
The vc5 HDMI registers hadn't been added into the debugfs
|
|
register sets, therefore weren't dumped on request.
|
|
Add them in.
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hdmi.c | 39 ++++++++++++++++++++++++++++++++++
|
|
drivers/gpu/drm/vc4/vc4_hdmi.h | 8 +++++++
|
|
2 files changed, 47 insertions(+)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
@@ -116,6 +116,12 @@ static int vc4_hdmi_debugfs_regs(struct
|
|
|
|
drm_print_regset32(&p, &vc4_hdmi->hdmi_regset);
|
|
drm_print_regset32(&p, &vc4_hdmi->hd_regset);
|
|
+ drm_print_regset32(&p, &vc4_hdmi->cec_regset);
|
|
+ drm_print_regset32(&p, &vc4_hdmi->csc_regset);
|
|
+ drm_print_regset32(&p, &vc4_hdmi->dvp_regset);
|
|
+ drm_print_regset32(&p, &vc4_hdmi->phy_regset);
|
|
+ drm_print_regset32(&p, &vc4_hdmi->ram_regset);
|
|
+ drm_print_regset32(&p, &vc4_hdmi->rm_regset);
|
|
|
|
return 0;
|
|
}
|
|
@@ -2370,6 +2376,7 @@ static int vc5_hdmi_init_resources(struc
|
|
struct platform_device *pdev = vc4_hdmi->pdev;
|
|
struct device *dev = &pdev->dev;
|
|
struct resource *res;
|
|
+ int ret;
|
|
|
|
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "hdmi");
|
|
if (!res)
|
|
@@ -2466,6 +2473,38 @@ static int vc5_hdmi_init_resources(struc
|
|
return PTR_ERR(vc4_hdmi->reset);
|
|
}
|
|
|
|
+ ret = vc4_hdmi_build_regset(vc4_hdmi, &vc4_hdmi->hdmi_regset, VC4_HDMI);
|
|
+ if (ret)
|
|
+ return ret;
|
|
+
|
|
+ ret = vc4_hdmi_build_regset(vc4_hdmi, &vc4_hdmi->hd_regset, VC4_HD);
|
|
+ if (ret)
|
|
+ return ret;
|
|
+
|
|
+ ret = vc4_hdmi_build_regset(vc4_hdmi, &vc4_hdmi->cec_regset, VC5_CEC);
|
|
+ if (ret)
|
|
+ return ret;
|
|
+
|
|
+ ret = vc4_hdmi_build_regset(vc4_hdmi, &vc4_hdmi->csc_regset, VC5_CSC);
|
|
+ if (ret)
|
|
+ return ret;
|
|
+
|
|
+ ret = vc4_hdmi_build_regset(vc4_hdmi, &vc4_hdmi->dvp_regset, VC5_DVP);
|
|
+ if (ret)
|
|
+ return ret;
|
|
+
|
|
+ ret = vc4_hdmi_build_regset(vc4_hdmi, &vc4_hdmi->phy_regset, VC5_PHY);
|
|
+ if (ret)
|
|
+ return ret;
|
|
+
|
|
+ ret = vc4_hdmi_build_regset(vc4_hdmi, &vc4_hdmi->ram_regset, VC5_RAM);
|
|
+ if (ret)
|
|
+ return ret;
|
|
+
|
|
+ ret = vc4_hdmi_build_regset(vc4_hdmi, &vc4_hdmi->rm_regset, VC5_RM);
|
|
+ if (ret)
|
|
+ return ret;
|
|
+
|
|
return 0;
|
|
}
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.h
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
|
|
@@ -216,6 +216,14 @@ struct vc4_hdmi {
|
|
* the scrambler on? Protected by @mutex.
|
|
*/
|
|
bool scdc_enabled;
|
|
+
|
|
+ /* VC5 debugfs regset */
|
|
+ struct debugfs_regset32 cec_regset;
|
|
+ struct debugfs_regset32 csc_regset;
|
|
+ struct debugfs_regset32 dvp_regset;
|
|
+ struct debugfs_regset32 phy_regset;
|
|
+ struct debugfs_regset32 ram_regset;
|
|
+ struct debugfs_regset32 rm_regset;
|
|
};
|
|
|
|
static inline struct vc4_hdmi *
|