mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-29 01:59:02 +00:00
ca5c695a45
Deleted following upstreamed patches: bcm27xx: 950-0006-drm-vc4-hdmi-Fix-HPD-GPIO-detection.patch bcm27xx: 950-0420-drm-vc4-Adopt-the-dma-configuration-from-the-HVS-or-.patch bcm27xx: 950-0425-drm-vc4-A-present-but-empty-dmas-disables-audio.patch bcm27xx: 950-0432-vc4-drm-Avoid-full-hdmi-audio-fifo-writes.patch bcm27xx: 950-0433-vc4-drm-vc4_plane-Remove-subpixel-positioning-check.patch bcm27xx: 950-0435-drm-vc4-Correct-pixel-order-for-DSI0.patch bcm27xx: 950-0436-drm-vc4-Register-dsi0-as-the-correct-vc4-encoder-typ.patch bcm27xx: 950-0437-drm-vc4-Fix-dsi0-interrupt-support.patch bcm27xx: 950-0438-drm-vc4-Add-correct-stop-condition-to-vc4_dsi_encode.patch bcm27xx: 950-0443-drm-vc4-Fix-timings-for-interlaced-modes.patch bcm27xx: 950-0445-drm-vc4-Fix-margin-calculations-for-the-right-bottom.patch bcm27xx: 950-0475-drm-vc4-Reset-HDMI-MISC_CONTROL-register.patch bcm27xx: 950-0476-drm-vc4-Release-workaround-buffer-and-DMA-in-error-p.patch bcm27xx: 950-0477-drm-vc4-Correct-DSI-divider-calculations.patch bcm27xx: 950-0664-drm-vc4-dsi-Correct-max-divider-to-255-not-7.patch bcm53xx: 072-next-ARM_dts_BCM53015-add-mr26.patch mediatek: 920-linux-next-dts-mt7622-bpi-r64-fix-wps-button.patch Manually rebased following patches: bcm27xx: 950-0004-drm-vc4-hdmi-Remove-the-DDC-probing-for-status-detec.patch bcm27xx: 950-0700-net-phy-lan87xx-Decrease-phy-polling-rate.patch bcm27xx: 950-0711-drm-vc4-Rename-bridge-to-out_bridge.patch bcm27xx: 950-0713-drm-vc4-Remove-splitting-the-bridge-chain-from-the-d.patch bcm27xx: 950-0715-drm-vc4-Convert-vc4_dsi-to-using-a-bridge-instead-of.patch bcm27xx: 950-0787-vc4-drm-vc4_plane-Keep-fractional-source-coords-insi.patch bcm27xx: 950-0914-mmc-block-Don-t-do-single-sector-reads-during-recove.patch Runtime tested on turris-omnia and glinet-b1300. Tested-by: John Audia <therealgraysky@proton.me> [bcm2711/RPi4B, mt7622/RT3200] Signed-off-by: Petr Štetiar <ynezz@true.cz>
57 lines
1.9 KiB
Diff
57 lines
1.9 KiB
Diff
From 9e26092eb098dec04ece28c05f859bc4add249c0 Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Thu, 30 Sep 2021 17:51:16 +0100
|
|
Subject: [PATCH] drm/vc4: Rename bridge to out_bridge
|
|
|
|
In preparation for converting the encoder to being a bridge,
|
|
rename the variable holding the next bridge in the chain to
|
|
out_bridge, so that our bridge can be called bridge.
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_dsi.c | 18 +++++++++---------
|
|
1 file changed, 9 insertions(+), 9 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_dsi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_dsi.c
|
|
@@ -553,7 +553,7 @@ struct vc4_dsi {
|
|
|
|
struct mipi_dsi_host dsi_host;
|
|
struct drm_encoder *encoder;
|
|
- struct drm_bridge *bridge;
|
|
+ struct drm_bridge *out_bridge;
|
|
struct list_head bridge_chain;
|
|
|
|
void __iomem *regs;
|
|
@@ -804,7 +804,7 @@ static void vc4_dsi_encoder_disable(stru
|
|
if (iter->funcs->disable)
|
|
iter->funcs->disable(iter);
|
|
|
|
- if (iter == dsi->bridge)
|
|
+ if (iter == dsi->out_bridge)
|
|
break;
|
|
}
|
|
|
|
@@ -1687,9 +1687,9 @@ static int vc4_dsi_bind(struct device *d
|
|
return ret;
|
|
}
|
|
|
|
- dsi->bridge = devm_drm_of_get_bridge(dev, dev->of_node, 0, 0);
|
|
- if (IS_ERR(dsi->bridge))
|
|
- return PTR_ERR(dsi->bridge);
|
|
+ dsi->out_bridge = devm_drm_of_get_bridge(dev, dev->of_node, 0, 0);
|
|
+ if (IS_ERR(dsi->out_bridge))
|
|
+ return PTR_ERR(dsi->out_bridge);
|
|
|
|
/* The esc clock rate is supposed to always be 100Mhz. */
|
|
ret = clk_set_rate(dsi->escape_clock, 100 * 1000000);
|
|
@@ -1705,7 +1705,7 @@ static int vc4_dsi_bind(struct device *d
|
|
drm_simple_encoder_init(drm, dsi->encoder, DRM_MODE_ENCODER_DSI);
|
|
drm_encoder_helper_add(dsi->encoder, &vc4_dsi_encoder_helper_funcs);
|
|
|
|
- ret = drm_bridge_attach(dsi->encoder, dsi->bridge, NULL, 0);
|
|
+ ret = drm_bridge_attach(dsi->encoder, dsi->out_bridge, NULL, 0);
|
|
if (ret)
|
|
return ret;
|
|
/* Disable the atomic helper calls into the bridge. We
|