From: Mark Yao Date: Mon, 5 Jun 2017 03:57:25 +0000 (+0800) Subject: Revert "drm/rockchip: vop: round_up pitches to word align" X-Git-Tag: release-20171130_firefly~4^2~446 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=422cba4c870f83802f929f48427635012e42f5c7;p=firefly-linux-kernel-4.4.55.git Revert "drm/rockchip: vop: round_up pitches to word align" This reverts commit 7e705c4974eaa8abaf44cb1542d3ec49d520fde8. Change-Id: I498ade43de012f65ea39624bd2982b4a84bcbf54 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 7273d3b55a89..5bef49fcc3f3 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -1224,10 +1224,10 @@ static void vop_plane_atomic_update(struct drm_plane *plane, VOP_WIN_SET(vop, win, xmirror, xmirror); VOP_WIN_SET(vop, win, ymirror, ymirror); VOP_WIN_SET(vop, win, format, vop_plane_state->format); - VOP_WIN_SET(vop, win, yrgb_vir, DIV_ROUND_UP(fb->pitches[0], 4)); + VOP_WIN_SET(vop, win, yrgb_vir, fb->pitches[0] >> 2); VOP_WIN_SET(vop, win, yrgb_mst, vop_plane_state->yrgb_mst); if (is_yuv_support(fb->pixel_format)) { - VOP_WIN_SET(vop, win, uv_vir, DIV_ROUND_UP(fb->pitches[1], 4)); + VOP_WIN_SET(vop, win, uv_vir, fb->pitches[1] >> 2); VOP_WIN_SET(vop, win, uv_mst, vop_plane_state->uv_mst); } VOP_WIN_SET(vop, win, fmt_10, is_yuv_10bit(fb->pixel_format));