1 From 9e26092eb098dec04ece28c05f859bc4add249c0 Mon Sep 17 00:00:00 2001
2 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
3 Date: Thu, 30 Sep 2021 17:51:16 +0100
4 Subject: [PATCH] drm/vc4: Rename bridge to out_bridge
6 In preparation for converting the encoder to being a bridge,
7 rename the variable holding the next bridge in the chain to
8 out_bridge, so that our bridge can be called bridge.
10 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
12 drivers/gpu/drm/vc4/vc4_dsi.c | 18 +++++++++---------
13 1 file changed, 9 insertions(+), 9 deletions(-)
15 --- a/drivers/gpu/drm/vc4/vc4_dsi.c
16 +++ b/drivers/gpu/drm/vc4/vc4_dsi.c
17 @@ -553,7 +553,7 @@ struct vc4_dsi {
19 struct mipi_dsi_host dsi_host;
20 struct drm_encoder *encoder;
21 - struct drm_bridge *bridge;
22 + struct drm_bridge *out_bridge;
23 struct list_head bridge_chain;
26 @@ -804,7 +804,7 @@ static void vc4_dsi_encoder_disable(stru
27 if (iter->funcs->disable)
28 iter->funcs->disable(iter);
30 - if (iter == dsi->bridge)
31 + if (iter == dsi->out_bridge)
35 @@ -1667,7 +1667,7 @@ static int vc4_dsi_bind(struct device *d
38 ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0,
39 - &panel, &dsi->bridge);
40 + &panel, &dsi->out_bridge);
42 /* If the bridge or panel pointed by dev->of_node is not
43 * enabled, just return 0 here so that we don't prevent the DRM
44 @@ -1682,10 +1682,10 @@ static int vc4_dsi_bind(struct device *d
48 - dsi->bridge = devm_drm_panel_bridge_add_typed(dev, panel,
49 - DRM_MODE_CONNECTOR_DSI);
50 - if (IS_ERR(dsi->bridge)) {
51 - ret = PTR_ERR(dsi->bridge);
52 + dsi->out_bridge = devm_drm_panel_bridge_add_typed(dev, panel,
53 + DRM_MODE_CONNECTOR_DSI);
54 + if (IS_ERR(dsi->out_bridge)) {
55 + ret = PTR_ERR(dsi->out_bridge);
59 @@ -1704,7 +1704,7 @@ static int vc4_dsi_bind(struct device *d
60 drm_simple_encoder_init(drm, dsi->encoder, DRM_MODE_ENCODER_DSI);
61 drm_encoder_helper_add(dsi->encoder, &vc4_dsi_encoder_helper_funcs);
63 - ret = drm_bridge_attach(dsi->encoder, dsi->bridge, NULL, 0);
64 + ret = drm_bridge_attach(dsi->encoder, dsi->out_bridge, NULL, 0);
66 dev_err(dev, "bridge attach failed: %d\n", ret);
68 @@ -1741,7 +1741,7 @@ static void vc4_dsi_unbind(struct device
70 struct vc4_dsi *dsi = dev_get_drvdata(dev);
73 + if (dsi->out_bridge)
74 pm_runtime_disable(dev);