From: Mark Yao Date: Fri, 4 Aug 2017 09:06:43 +0000 (+0800) Subject: drm/rockchip: vop: fixup post scale configure X-Git-Tag: release-20171130_firefly~4^2~23 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b3702b38a11e248e06a9ec91d47503ca0f549b7f;p=firefly-linux-kernel-4.4.55.git 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 --- diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index c2a7b9fe3161..8d7cba2e7b79 100644 --- 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;