From: Mark Yao Date: Tue, 2 May 2017 07:22:43 +0000 (+0800) Subject: drm/rockchip: vop: fix NV12 video display error X-Git-Tag: release-20171130_firefly~4^2~693 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cf24760cf662681df6d8b825d0d3e255bc729712;p=firefly-linux-kernel-4.4.55.git drm/rockchip: vop: fix NV12 video display error fixup the scale calculation formula on the case src_height == (dst_height/2). Change-Id: I620a4646232c016ff1547b5b6469ed2eedeacfed Signed-off-by: Mark Yao --- diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h index 7e45492ba1a3..3519520c4a7a 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h @@ -446,6 +446,9 @@ static inline uint16_t scl_get_bili_dn_vskip(int src_h, int dst_h, act_height = (src_h + vskiplines - 1) / vskiplines; + if (act_height == dst_h) + return GET_SCL_FT_BILI_DN(src_h, dst_h) / vskiplines; + return GET_SCL_FT_BILI_DN(act_height, dst_h); }