aboutsummaryrefslogtreecommitdiff
path: root/target/linux/bcm27xx/patches-5.15/950-0711-drm-vc4-Rename-bridge-to-out_bridge.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/bcm27xx/patches-5.15/950-0711-drm-vc4-Rename-bridge-to-out_bridge.patch')
-rw-r--r--target/linux/bcm27xx/patches-5.15/950-0711-drm-vc4-Rename-bridge-to-out_bridge.patch56
1 files changed, 0 insertions, 56 deletions
diff --git a/target/linux/bcm27xx/patches-5.15/950-0711-drm-vc4-Rename-bridge-to-out_bridge.patch b/target/linux/bcm27xx/patches-5.15/950-0711-drm-vc4-Rename-bridge-to-out_bridge.patch
deleted file mode 100644
index df4aece95e..0000000000
--- a/target/linux/bcm27xx/patches-5.15/950-0711-drm-vc4-Rename-bridge-to-out_bridge.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-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