mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 00:41:17 +00:00
39 lines
1.2 KiB
Diff
39 lines
1.2 KiB
Diff
|
From 7a1c157ac856384c47df38e1de2995f55a111b85 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
||
|
|
Date: Fri, 17 Feb 2023 13:41:59 +0100
|
||
|
|
Subject: [PATCH] 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),
|
||
|
|
@@ -1467,8 +1467,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;
|