target/linux/bcm27xx/patches-5.10/950-0560-drm-vc4-drv-Remove-the-DSI-pointer-in-vc4_drv.patch

   1 From f9211d36925dac42f910d7d2e4c370e414fd24d2 Mon Sep 17 00:00:00 2001
   2 From: Maxime Ripard <maxime@cerno.tech>
   3 Date: Thu, 3 Dec 2020 14:25:36 +0100
   4 Subject: [PATCH] drm/vc4: drv: Remove the DSI pointer in vc4_drv
   5
   6 Commit 51f4fcd9c4ea867c3b4fe58111f342ad0e80642a upstream.
   7
   8 That pointer isn't used anywhere, so there's no point in keeping it.
   9
  10 Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  11 Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  12 Link: https://patchwork.freedesktop.org/patch/msgid/20201203132543.861591-2-maxime@cerno.tech
  13 ---
  14  drivers/gpu/drm/vc4/vc4_drv.h | 1 -
  15  drivers/gpu/drm/vc4/vc4_dsi.c | 9 ---------
  16  2 files changed, 10 deletions(-)
  17
  18 --- a/drivers/gpu/drm/vc4/vc4_drv.h
  19 +++ b/drivers/gpu/drm/vc4/vc4_drv.h
  20 @@ -81,7 +81,6 @@ struct vc4_dev {
  21         struct vc4_hvs *hvs;
  22         struct vc4_v3d *v3d;
  23         struct vc4_dpi *dpi;
  24 -       struct vc4_dsi *dsi1;
  25         struct vc4_vec *vec;
  26         struct vc4_txp *txp;
  27         struct vc4_fkms *fkms;
  28 --- a/drivers/gpu/drm/vc4/vc4_dsi.c
  29 +++ b/drivers/gpu/drm/vc4/vc4_dsi.c
  30 @@ -1451,7 +1451,6 @@ static int vc4_dsi_bind(struct device *d
  31  {
  32         struct platform_device *pdev = to_platform_device(dev);
  33         struct drm_device *drm = dev_get_drvdata(master);
  34 -       struct vc4_dev *vc4 = to_vc4_dev(drm);
  35         struct vc4_dsi *dsi = dev_get_drvdata(dev);
  36         struct vc4_dsi_encoder *vc4_dsi_encoder;
  37         struct drm_panel *panel;
  38 @@ -1604,9 +1603,6 @@ static int vc4_dsi_bind(struct device *d
  39         if (ret)
  40                 return ret;
  41
  42 -       if (dsi->port == 1)
  43 -               vc4->dsi1 = dsi;
  44 -
  45         drm_simple_encoder_init(drm, dsi->encoder, DRM_MODE_ENCODER_DSI);
  46         drm_encoder_helper_add(dsi->encoder, &vc4_dsi_encoder_helper_funcs);
  47
  48 @@ -1635,8 +1631,6 @@ static int vc4_dsi_bind(struct device *d
  49  static void vc4_dsi_unbind(struct device *dev, struct device *master,
  50                            void *data)
  51  {
  52 -       struct drm_device *drm = dev_get_drvdata(master);
  53 -       struct vc4_dev *vc4 = to_vc4_dev(drm);
  54         struct vc4_dsi *dsi = dev_get_drvdata(dev);
  55
  56         if (dsi->bridge)
  57 @@ -1648,9 +1642,6 @@ static void vc4_dsi_unbind(struct device
  58          */
  59         list_splice_init(&dsi->bridge_chain, &dsi->encoder->bridge_chain);
  60         drm_encoder_cleanup(dsi->encoder);
  61 -
  62 -       if (dsi->port == 1)
  63 -               vc4->dsi1 = NULL;
  64  }
  65
  66  static const struct component_ops vc4_dsi_ops = {