[PATCH 46/64] drm/vc4: txp: Remove duplicate regset

[Thomas Zimmermann]

Am 10.06.22 um 11:29 schrieb Maxime Ripard:
> There's already a regset in the vc4_crtc structure so there's no need to
> duplicate it in vc4_txp.
> 
> Signed-off-by: Maxime Ripard <maxime at cerno.tech>

Acked-by: Thomas Zimmermann <tzimmermann at suse.de>

> ---
>   drivers/gpu/drm/vc4/vc4_txp.c | 9 ++++-----
>   1 file changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/vc4/vc4_txp.c b/drivers/gpu/drm/vc4/vc4_txp.c
> index 87c896f482fb..51ac01838093 100644
> --- a/drivers/gpu/drm/vc4/vc4_txp.c
> +++ b/drivers/gpu/drm/vc4/vc4_txp.c
> @@ -154,7 +154,6 @@ struct vc4_txp {
>   	struct drm_writeback_connector connector;
>   
>   	void __iomem *regs;
> -	struct debugfs_regset32 regset;
>   };
>   
>   static inline struct vc4_txp *encoder_to_vc4_txp(struct drm_encoder *encoder)
> @@ -493,9 +492,9 @@ static int vc4_txp_bind(struct device *dev, struct device *master, void *data)
>   	txp->regs = vc4_ioremap_regs(pdev, 0);
>   	if (IS_ERR(txp->regs))
>   		return PTR_ERR(txp->regs);
> -	txp->regset.base = txp->regs;
> -	txp->regset.regs = txp_regs;
> -	txp->regset.nregs = ARRAY_SIZE(txp_regs);
> +	vc4_crtc->regset.base = txp->regs;
> +	vc4_crtc->regset.regs = txp_regs;
> +	vc4_crtc->regset.nregs = ARRAY_SIZE(txp_regs);
>   
>   	drm_connector_helper_add(&txp->connector.base,
>   				 &vc4_txp_connector_helper_funcs);
> @@ -521,7 +520,7 @@ static int vc4_txp_bind(struct device *dev, struct device *master, void *data)
>   
>   	dev_set_drvdata(dev, txp);
>   
> -	vc4_debugfs_add_regset32(drm, "txp_regs", &txp->regset);
> +	vc4_debugfs_add_regset32(drm, "txp_regs", &vc4_crtc->regset);
>   
>   	return 0;
>   }

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Ivo Totev
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature
Type: application/pgp-signature
Size: 840 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20220620/3d3ec103/attachment.sig>