]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/vc4: hvs: Rename hvs_regs list
authorMaxime Ripard <mripard@kernel.org>
Fri, 21 Jun 2024 15:20:49 +0000 (16:20 +0100)
committerDave Stevenson <dave.stevenson@raspberrypi.com>
Mon, 9 Sep 2024 12:02:53 +0000 (13:02 +0100)
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 <mripard@kernel.org>
Reviewed-by: Maxime Ripard <mripard@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240621152055.4180873-26-dave.stevenson@raspberrypi.com
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
drivers/gpu/drm/vc4/vc4_hvs.c

index 5bda9525cffe9f6e0c017f3b82ab40df20959d26..ecba1f7bc1e00d3cf7b5d604aa0bb173110edb9b 100644 (file)
@@ -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;