c06fb25d1f
Some checks failed
Build Kernel / Build all affected Kernels (push) Has been cancelled
Build all core packages / Build all core packages for selected target (push) Has been cancelled
Build and Push prebuilt tools container / Build and Push all prebuilt containers (push) Has been cancelled
Build Toolchains / Build Toolchains for each target (push) Has been cancelled
Build host tools / Build host tools for linux and macos based systems (push) Has been cancelled
Coverity scan build / Coverity x86/64 build (push) Has been cancelled
39 lines
1.2 KiB
Diff
39 lines
1.2 KiB
Diff
From cdbd831a014d157fed188ba2504010f58e5dd2f6 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Fri, 17 Feb 2023 13:41:59 +0100
|
|
Subject: [PATCH 0592/1085] drm/vc4: hvs: Rename hvs_regs list
|
|
|
|
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 <maxime@cerno.tech>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hvs.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
--- 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),
|
|
@@ -1473,8 +1473,8 @@ static int vc4_hvs_bind(struct device *d
|
|
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;
|