mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 06:57:57 +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
115 lines
3.7 KiB
Diff
115 lines
3.7 KiB
Diff
From db56206e77d1a71c145669dc41d0ada496ea8e4f Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Wed, 28 Apr 2021 12:32:10 +0200
|
|
Subject: [PATCH] drm/vc4: Add debugfs node that dumps the vc5 gamma
|
|
PWL entries
|
|
|
|
This helps with debugging the conversion from a 256 point gamma LUT to
|
|
16 point PWL entries as used by the BCM2711.
|
|
|
|
Co-developed-by: Juerg Haefliger <juergh@canonical.com>
|
|
Signed-off-by: Juerg Haefliger <juergh@canonical.com>
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hvs.c | 81 +++++++++++++++++++++++++++++++++++
|
|
1 file changed, 81 insertions(+)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hvs.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
|
|
@@ -134,6 +134,84 @@ static int vc4_hvs_debugfs_dlist(struct
|
|
return 0;
|
|
}
|
|
|
|
+static int vc5_hvs_debugfs_gamma(struct seq_file *m, void *data)
|
|
+{
|
|
+ struct drm_info_node *node = m->private;
|
|
+ struct drm_device *dev = node->minor->dev;
|
|
+ struct vc4_dev *vc4 = to_vc4_dev(dev);
|
|
+ struct drm_printer p = drm_seq_file_printer(m);
|
|
+ unsigned int i, chan;
|
|
+ u32 dispstat, dispbkgndx;
|
|
+
|
|
+ for (chan = 0; chan < SCALER_CHANNELS_COUNT; chan++) {
|
|
+ u32 x_c, grad;
|
|
+ u32 offset = SCALER5_DSPGAMMA_START +
|
|
+ chan * SCALER5_DSPGAMMA_CHAN_OFFSET;
|
|
+
|
|
+ dispstat = VC4_GET_FIELD(HVS_READ(SCALER_DISPSTATX(chan)),
|
|
+ SCALER_DISPSTATX_MODE);
|
|
+ if (dispstat == SCALER_DISPSTATX_MODE_DISABLED ||
|
|
+ dispstat == SCALER_DISPSTATX_MODE_EOF) {
|
|
+ drm_printf(&p, "HVS channel %u: Channel disabled\n", chan);
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ dispbkgndx = HVS_READ(SCALER_DISPBKGNDX(chan));
|
|
+ if (!(dispbkgndx & SCALER_DISPBKGND_GAMMA)) {
|
|
+ drm_printf(&p, "HVS channel %u: Gamma disabled\n", chan);
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ drm_printf(&p, "HVS channel %u:\n", chan);
|
|
+ drm_printf(&p, " red:\n");
|
|
+ for (i = 0; i < SCALER5_DSPGAMMA_NUM_POINTS; i++, offset += 8) {
|
|
+ x_c = HVS_READ(offset);
|
|
+ grad = HVS_READ(offset + 4);
|
|
+ drm_printf(&p, " %08x %08x - x %u, c %u, grad %u\n",
|
|
+ x_c, grad,
|
|
+ VC4_GET_FIELD(x_c, SCALER5_DSPGAMMA_OFF_X),
|
|
+ VC4_GET_FIELD(x_c, SCALER5_DSPGAMMA_OFF_C),
|
|
+ grad);
|
|
+ }
|
|
+ drm_printf(&p, " green:\n");
|
|
+ for (i = 0; i < SCALER5_DSPGAMMA_NUM_POINTS; i++, offset += 8) {
|
|
+ x_c = HVS_READ(offset);
|
|
+ grad = HVS_READ(offset + 4);
|
|
+ drm_printf(&p, " %08x %08x - x %u, c %u, grad %u\n",
|
|
+ x_c, grad,
|
|
+ VC4_GET_FIELD(x_c, SCALER5_DSPGAMMA_OFF_X),
|
|
+ VC4_GET_FIELD(x_c, SCALER5_DSPGAMMA_OFF_C),
|
|
+ grad);
|
|
+ }
|
|
+ drm_printf(&p, " blue:\n");
|
|
+ for (i = 0; i < SCALER5_DSPGAMMA_NUM_POINTS; i++, offset += 8) {
|
|
+ x_c = HVS_READ(offset);
|
|
+ grad = HVS_READ(offset + 4);
|
|
+ drm_printf(&p, " %08x %08x - x %u, c %u, grad %u\n",
|
|
+ x_c, grad,
|
|
+ VC4_GET_FIELD(x_c, SCALER5_DSPGAMMA_OFF_X),
|
|
+ VC4_GET_FIELD(x_c, SCALER5_DSPGAMMA_OFF_C),
|
|
+ grad);
|
|
+ }
|
|
+
|
|
+ /* Alpha only valid on channel 2 */
|
|
+ if (chan != 2)
|
|
+ continue;
|
|
+
|
|
+ drm_printf(&p, " alpha:\n");
|
|
+ for (i = 0; i < SCALER5_DSPGAMMA_NUM_POINTS; i++, offset += 8) {
|
|
+ x_c = HVS_READ(offset);
|
|
+ grad = HVS_READ(offset + 4);
|
|
+ drm_printf(&p, " %08x %08x - x %u, c %u, grad %u\n",
|
|
+ x_c, grad,
|
|
+ VC4_GET_FIELD(x_c, SCALER5_DSPGAMMA_OFF_X),
|
|
+ VC4_GET_FIELD(x_c, SCALER5_DSPGAMMA_OFF_C),
|
|
+ grad);
|
|
+ }
|
|
+ }
|
|
+ return 0;
|
|
+}
|
|
+
|
|
/* The filter kernel is composed of dwords each containing 3 9-bit
|
|
* signed integers packed next to each other.
|
|
*/
|
|
@@ -859,6 +937,9 @@ static int vc4_hvs_bind(struct device *d
|
|
NULL);
|
|
vc4_debugfs_add_file(drm, "hvs_dlists", vc4_hvs_debugfs_dlist,
|
|
NULL);
|
|
+ if (hvs->hvs5)
|
|
+ vc4_debugfs_add_file(drm, "hvs_gamma", vc5_hvs_debugfs_gamma,
|
|
+ NULL);
|
|
|
|
return 0;
|
|
}
|