mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 17:01:14 +00:00
57 lines
1.7 KiB
Diff
57 lines
1.7 KiB
Diff
|
From ed34c4192a6189ef27ea4a1958ea843906afbe4d 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 | 12 ++++++------
|
||
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/gpu/drm/vc4/vc4_dsi.c
|
||
|
|
+++ b/drivers/gpu/drm/vc4/vc4_dsi.c
|
||
|
|
@@ -556,7 +556,7 @@ struct vc4_dsi {
|
||
|
|
|
||
|
|
struct platform_device *pdev;
|
||
|
|
|
||
|
|
- struct drm_bridge *bridge;
|
||
|
|
+ struct drm_bridge *out_bridge;
|
||
|
|
struct list_head bridge_chain;
|
||
|
|
|
||
|
|
void __iomem *regs;
|
||
|
|
@@ -800,7 +800,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;
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -1723,9 +1723,9 @@ static int vc4_dsi_bind(struct device *d
|
||
|
|
return ret;
|
||
|
|
}
|
||
|
|
|
||
|
|
- dsi->bridge = drmm_of_get_bridge(drm, dev->of_node, 0, 0);
|
||
|
|
- if (IS_ERR(dsi->bridge))
|
||
|
|
- return PTR_ERR(dsi->bridge);
|
||
|
|
+ dsi->out_bridge = drmm_of_get_bridge(drm, 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);
|
||
|
|
@@ -1751,7 +1751,7 @@ static int vc4_dsi_bind(struct device *d
|
||
|
|
if (ret)
|
||
|
|
return ret;
|
||
|
|
|
||
|
|
- ret = drm_bridge_attach(encoder, dsi->bridge, NULL, 0);
|
||
|
|
+ ret = drm_bridge_attach(encoder, dsi->out_bridge, NULL, 0);
|
||
|
|
if (ret)
|
||
|
|
return ret;
|
||
|
|
/* Disable the atomic helper calls into the bridge. We
|