target/linux/bcm27xx/patches-6.1/950-0481-drm-vc4-txp-Reorder-the-variable-assignments.patch

   1 From 32d1377cec2075ce76756f687b964b1b02beed65 Mon Sep 17 00:00:00 2001
   2 From: Maxime Ripard <maxime@cerno.tech>
   3 Date: Wed, 23 Nov 2022 16:25:56 +0100
   4 Subject: [PATCH] drm/vc4: txp: Reorder the variable assignments
   5
   6 The current order of variable assignments is unneccessarily complex,
   7 let's make it simpler.
   8
   9 Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
  10 Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  11 Link: https://patchwork.freedesktop.org/patch/msgid/20221123-rpi-kunit-tests-v1-14-051a0bb60a16@cerno.tech
  12 ---
  13  drivers/gpu/drm/vc4/vc4_txp.c | 15 ++++++---------
  14  1 file changed, 6 insertions(+), 9 deletions(-)
  15
  16 --- a/drivers/gpu/drm/vc4/vc4_txp.c
  17 +++ b/drivers/gpu/drm/vc4/vc4_txp.c
  18 @@ -490,7 +490,6 @@ static int vc4_txp_bind(struct device *d
  19         struct drm_device *drm = dev_get_drvdata(master);
  20         struct vc4_crtc *vc4_crtc;
  21         struct vc4_txp *txp;
  22 -       struct drm_crtc *crtc;
  23         struct drm_encoder *encoder;
  24         int ret, irq;
  25
  26 @@ -501,18 +500,16 @@ static int vc4_txp_bind(struct device *d
  27         txp = drmm_kzalloc(drm, sizeof(*txp), GFP_KERNEL);
  28         if (!txp)
  29                 return -ENOMEM;
  30 -       vc4_crtc = &txp->base;
  31 -       crtc = &vc4_crtc->base;
  32 -
  33 -       vc4_crtc->pdev = pdev;
  34 -       vc4_crtc->data = &vc4_txp_crtc_data;
  35 -       vc4_crtc->feeds_txp = true;
  36
  37         txp->pdev = pdev;
  38 -
  39         txp->regs = vc4_ioremap_regs(pdev, 0);
  40         if (IS_ERR(txp->regs))
  41                 return PTR_ERR(txp->regs);
  42 +
  43 +       vc4_crtc = &txp->base;
  44 +       vc4_crtc->pdev = pdev;
  45 +       vc4_crtc->data = &vc4_txp_crtc_data;
  46 +       vc4_crtc->feeds_txp = true;
  47         vc4_crtc->regset.base = txp->regs;
  48         vc4_crtc->regset.regs = txp_regs;
  49         vc4_crtc->regset.nregs = ARRAY_SIZE(txp_regs);
  50 @@ -533,7 +530,7 @@ static int vc4_txp_bind(struct device *d
  51                 return ret;
  52
  53         encoder = &txp->connector.encoder;
  54 -       encoder->possible_crtcs = drm_crtc_mask(crtc);
  55 +       encoder->possible_crtcs = drm_crtc_mask(&vc4_crtc->base);
  56
  57         ret = devm_request_irq(dev, irq, vc4_txp_interrupt, 0,
  58                                dev_name(dev), txp);