drm/rockchip: vop: fixup post scale configure

Fixes: 7f1f1ef ("drm/rockchip: vop: don't force enable post scale")
Change-Id: I57b44e7fe00bce7615ecde2e1f23837c74532c68
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
index c2a7b9fe3161a861cdef850ad7626bd42c14b9e2..8d7cba2e7b79223a54e0471fe9c2c49426410f12 100644 (file)
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@ -2097,7 +2097,7 @@ static void vop_post_config(struct drm_crtc *crtc)
 #define POST_HORIZONTAL_SCALEDOWN_EN(x)                ((x) << 0)
 #define POST_VERTICAL_SCALEDOWN_EN(x)          ((x) << 1)
        VOP_CTRL_SET(vop, post_scl_ctrl,
-                    POST_HORIZONTAL_SCALEDOWN_EN(hdisplay != hsize) ||
+                    POST_HORIZONTAL_SCALEDOWN_EN(hdisplay != hsize) |
                     POST_VERTICAL_SCALEDOWN_EN(vdisplay != vsize));
        if (mode->flags & DRM_MODE_FLAG_INTERLACE) {
                u16 vact_st_f1 = vtotal + vact_st + 1;