mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 15:02:32 +00:00
9703a2adcc
Refresh all patches on top of kernel 5.10.138. The following patches were applied upstream: bcm27xx/patches-5.10/950-0311-drm-vc4-Adopt-the-dma-configuration-from-the-HVS-or-.patch bcm27xx/patches-5.10/950-0317-vc4_hdmi-Remove-firmware-logic-for-MAI-threshold-set.patch bcm27xx/patches-5.10/950-0346-drm-vc4-A-present-but-empty-dmas-disables-audio.patch bcm27xx/patches-5.10/950-0354-drm-vc4-Add-the-2711-HVS-as-a-suitable-DMA-node.patch bcm27xx/patches-5.10/950-0413-drm-vc4-hdmi-Don-t-access-the-connector-state-in-res.patch bcm27xx/patches-5.10/950-0505-vc4-drm-Avoid-full-hdmi-audio-fifo-writes.patch bcm27xx/patches-5.10/950-0512-vc4-drm-vc4_plane-Remove-subpixel-positioning-check.patch bcm27xx/patches-5.10/950-0560-drm-vc4-drv-Remove-the-DSI-pointer-in-vc4_drv.patch bcm27xx/patches-5.10/950-0561-drm-vc4-dsi-Use-snprintf-for-the-PHY-clocks-instead-.patch bcm27xx/patches-5.10/950-0562-drm-vc4-dsi-Introduce-a-variant-structure.patch bcm27xx/patches-5.10/950-0565-drm-vc4-Correct-pixel-order-for-DSI0.patch bcm27xx/patches-5.10/950-0566-drm-vc4-Register-dsi0-as-the-correct-vc4-encoder-typ.patch bcm27xx/patches-5.10/950-0567-drm-vc4-Fix-dsi0-interrupt-support.patch bcm27xx/patches-5.10/950-0568-drm-vc4-Add-correct-stop-condition-to-vc4_dsi_encode.patch bcm27xx/patches-5.10/950-0647-drm-vc4-Fix-timings-for-interlaced-modes.patch bcm27xx/patches-5.10/950-0695-drm-vc4-Fix-margin-calculations-for-the-right-bottom.patch Upstream sets the pixel clock to 340MHz now, do not set it to 600MHz any more. bcm27xx/patches-5.10/950-0576-drm-vc4-hdmi-Raise-the-maximum-clock-rate.patch Fixes:89956c6532("kernel: bump 5.10 to 5.10.138") Fixes:4209c33ae2("kernel: bump 5.10 to 5.10.137") Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
54 lines
2.0 KiB
Diff
54 lines
2.0 KiB
Diff
From 24b8230e039c6bef2dcc0ea4ca7cb5d2441570f1 Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Thu, 3 Dec 2020 14:25:42 +0100
|
|
Subject: [PATCH] drm/vc4: dsi: Add configuration for BCM2711 DSI1
|
|
|
|
Commit d0666be8ef9e8e65d4b7fabc1606ec51f61384c0 upstream.
|
|
|
|
BCM2711 DSI1 doesn't have the issue with the ARM not being
|
|
able to write to the registers, therefore remove the DMA
|
|
workaround for that compatible string.
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
Link: https://patchwork.freedesktop.org/patch/msgid/20201203132543.861591-8-maxime@cerno.tech
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_dsi.c | 12 ++++++++++--
|
|
1 file changed, 10 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_dsi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_dsi.c
|
|
@@ -1374,6 +1374,13 @@ static const struct drm_encoder_helper_f
|
|
.mode_fixup = vc4_dsi_encoder_mode_fixup,
|
|
};
|
|
|
|
+static const struct vc4_dsi_variant bcm2711_dsi1_variant = {
|
|
+ .port = 1,
|
|
+ .debugfs_name = "dsi1_regs",
|
|
+ .regs = dsi1_regs,
|
|
+ .nregs = ARRAY_SIZE(dsi1_regs),
|
|
+};
|
|
+
|
|
static const struct vc4_dsi_variant bcm2835_dsi0_variant = {
|
|
.port = 0,
|
|
.debugfs_name = "dsi0_regs",
|
|
@@ -1390,6 +1397,7 @@ static const struct vc4_dsi_variant bcm2
|
|
};
|
|
|
|
static const struct of_device_id vc4_dsi_dt_match[] = {
|
|
+ { .compatible = "brcm,bcm2711-dsi1", &bcm2711_dsi1_variant },
|
|
{ .compatible = "brcm,bcm2835-dsi0", &bcm2835_dsi0_variant },
|
|
{ .compatible = "brcm,bcm2835-dsi1", &bcm2835_dsi1_variant },
|
|
{}
|
|
@@ -1577,8 +1585,8 @@ static int vc4_dsi_bind(struct device *d
|
|
return -ENODEV;
|
|
}
|
|
|
|
- /* DSI1 has a broken AXI slave that doesn't respond to writes
|
|
- * from the ARM. It does handle writes from the DMA engine,
|
|
+ /* DSI1 on BCM2835/6/7 has a broken AXI slave that doesn't respond to
|
|
+ * writes from the ARM. It does handle writes from the DMA engine,
|
|
* so set up a channel for talking to it.
|
|
*/
|
|
if (dsi->variant->broken_axi_workaround) {
|