projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
abd4e74
)
drm/rockchip: fix VOP_WIN_GET macro
author
John Keeping
<john@metanate.com>
Wed, 3 Jul 2019 09:51:11 +0000
(10:51 +0100)
committer
Heiko Stuebner
<heiko@sntech.de>
Wed, 7 Aug 2019 22:23:15 +0000
(
00:23
+0200)
Commit
9a61c54b9bff
("drm/rockchip: vop: group vop registers") seems to
have unintentionally changed the defintion of this macro. Since it is
unused, this was not spotted but any attempt to use it results in
compilation errors.
Revert to the previous definition.
Fixes:
9a61c54b9bff
("drm/rockchip: vop: group vop registers")
Signed-off-by: John Keeping <john@metanate.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link:
https://patchwork.freedesktop.org/patch/msgid/20190703095111.29117-1-john@metanate.com
drivers/gpu/drm/rockchip/rockchip_drm_vop.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
index
7a30533
..
2f821c5
100644
(file)
--- a/
drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+++ b/
drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@
-82,7
+82,7
@@
vop_get_intr_type(vop, &vop->data->intr->name, type)
#define VOP_WIN_GET(vop, win, name) \
- vop_read_reg(vop, win->
offset,
win->phy->name)
+ vop_read_reg(vop, win->
base, &
win->phy->name)
#define VOP_WIN_HAS_REG(win, name) \
(!!(win->phy->name.mask))