Unverified Commit 260ad78e authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm/vc4: txp: Remove duplicate regset 



There's already a regset in the vc4_crtc structure so there's no need to
duplicate it in vc4_txp.

Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://lore.kernel.org/r/20220711173939.1132294-51-maxime@cerno.tech
parent 121b1a5f

drivers/gpu/drm/vc4/vc4_txp.c

+4 −5
Original line number Diff line number Diff line
@@ -155,7 +155,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)
@@ -494,9 +493,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);
@@ -523,7 +522,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;

}