From eaa2077de09551704a4dafbba74b72eec74db9c7 Mon Sep 17 00:00:00 2001 From: Sandy Huang Date: Tue, 26 Dec 2017 16:20:26 +0800 Subject: [PATCH] drm/rockchip: fix VOP_REG_SUPPORT judge wrong If the register isn't define at rockchip_vop_reg.c, the default value of reg.major is 0, this will lead to judge error. so we add reg.mask conditions because if it's defined register, the reg.mask can't be 0. Change-Id: I753b92476fda15a64f94e4a8a47894c5ac3a1a7f Signed-off-by: Sandy Huang --- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index dd15da42ec13..fb86948d8124 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -51,10 +51,11 @@ #define MAX_VOPS 2 #define VOP_REG_SUPPORT(vop, reg) \ - (!reg.major || (reg.major == VOP_MAJOR(vop->version) && \ - reg.begin_minor <= VOP_MINOR(vop->version) && \ - reg.end_minor >= VOP_MINOR(vop->version) && \ - reg.mask)) + (reg.mask && \ + (!reg.major || \ + (reg.major == VOP_MAJOR(vop->version) && \ + reg.begin_minor <= VOP_MINOR(vop->version) && \ + reg.end_minor >= VOP_MINOR(vop->version)))) #define VOP_WIN_SUPPORT(vop, win, name) \ VOP_REG_SUPPORT(vop, win->phy->name)