target/linux/bcm27xx/patches-5.15/950-0711-drm-vc4-Rename-bridge-to-out_bridge.patch

   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
   5
   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.
   9
  10 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  11 ---
  12  drivers/gpu/drm/vc4/vc4_dsi.c | 18 +++++++++---------
  13  1 file changed, 9 insertions(+), 9 deletions(-)
  14
  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 {
  18
  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;
  24
  25         void __iomem *regs;
  26 @@ -804,7 +804,7 @@ static void vc4_dsi_encoder_disable(stru
  27                 if (iter->funcs->disable)
  28                         iter->funcs->disable(iter);
  29
  30 -               if (iter == dsi->bridge)
  31 +               if (iter == dsi->out_bridge)
  32                         break;
  33         }
  34
  35 @@ -1687,9 +1687,9 @@ static int vc4_dsi_bind(struct device *d
  36                 return ret;
  37         }
  38
  39 -       dsi->bridge = devm_drm_of_get_bridge(dev, dev->of_node, 0, 0);
  40 -       if (IS_ERR(dsi->bridge))
  41 -               return PTR_ERR(dsi->bridge);
  42 +       dsi->out_bridge = devm_drm_of_get_bridge(dev, dev->of_node, 0, 0);
  43 +       if (IS_ERR(dsi->out_bridge))
  44 +               return PTR_ERR(dsi->out_bridge);
  45
  46         /* The esc clock rate is supposed to always be 100Mhz. */
  47         ret = clk_set_rate(dsi->escape_clock, 100 * 1000000);
  48 @@ -1705,7 +1705,7 @@ static int vc4_dsi_bind(struct device *d
  49         drm_simple_encoder_init(drm, dsi->encoder, DRM_MODE_ENCODER_DSI);
  50         drm_encoder_helper_add(dsi->encoder, &vc4_dsi_encoder_helper_funcs);
  51
  52 -       ret = drm_bridge_attach(dsi->encoder, dsi->bridge, NULL, 0);
  53 +       ret = drm_bridge_attach(dsi->encoder, dsi->out_bridge, NULL, 0);
  54         if (ret)
  55                 return ret;
  56         /* Disable the atomic helper calls into the bridge.  We