Revert "drm/rockchip: vop: round_up pitches to word align"

This reverts commit 7e705c4974eaa8abaf44cb1542d3ec49d520fde8.

Change-Id: I498ade43de012f65ea39624bd2982b4a84bcbf54
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 7273d3b55a89d4214fd25d68e9c67a39db5572e3..5bef49fcc3f37a138002ebb6e1d6cd3dacecab3d 100644 (file)
--- 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));