From: John Keeping Date: Wed, 3 Jul 2019 09:51:11 +0000 (+0100) Subject: drm/rockchip: fix VOP_WIN_GET macro X-Git-Tag: v5.4-rc1~32^2~20^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cc8f12996e24b102a086a253055ecc58c437c31d;p=platform%2Fkernel%2Flinux-rpi.git drm/rockchip: fix VOP_WIN_GET macro 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 Signed-off-by: Heiko Stuebner Link: https://patchwork.freedesktop.org/patch/msgid/20190703095111.29117-1-john@metanate.com --- diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index 7a30533d5c34..2f821c58007c 100644 --- 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))