From: Maxime Ripard <mrip...@kernel.org>

The HVS register set has been heavily modified in the BCM2712, and we'll
thus need a separate debugfs_reg32 array for it.

The name hvs_regs is thus a bit too generic, so let's rename it to
something more specific.

Signed-off-by: Maxime Ripard <mrip...@kernel.org>
Signed-off-by: Dave Stevenson <dave.steven...@raspberrypi.com>
---
 drivers/gpu/drm/vc4/vc4_hvs.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/vc4/vc4_hvs.c b/drivers/gpu/drm/vc4/vc4_hvs.c
index bd9ae25dbdcf..3f323a9d5e9a 100644
--- a/drivers/gpu/drm/vc4/vc4_hvs.c
+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
@@ -33,7 +33,7 @@
 #include "vc4_drv.h"
 #include "vc4_regs.h"
 
-static const struct debugfs_reg32 hvs_regs[] = {
+static const struct debugfs_reg32 vc4_hvs_regs[] = {
        VC4_REG32(SCALER_DISPCTRL),
        VC4_REG32(SCALER_DISPSTAT),
        VC4_REG32(SCALER_DISPID),
@@ -1028,8 +1028,8 @@ static int vc4_hvs_bind(struct device *dev, struct device 
*master, void *data)
                return PTR_ERR(hvs->regs);
 
        hvs->regset.base = hvs->regs;
-       hvs->regset.regs = hvs_regs;
-       hvs->regset.nregs = ARRAY_SIZE(hvs_regs);
+       hvs->regset.regs = vc4_hvs_regs;
+       hvs->regset.nregs = ARRAY_SIZE(vc4_hvs_regs);
 
        if (vc4->gen == VC4_GEN_5) {
                struct rpi_firmware *firmware;
-- 
2.34.1

Reply via email to