Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79a0b149 authored by Mark Yao's avatar Mark Yao
Browse files

drm/rockchip: vop: round_up pitches to word align 



VOP pitch register is word align, need align to word.

VOP_WIN0_VIR:
  bit[31:16] win0_vir_stride_uv
    Number of words of Win0 uv Virtual width
  bit[15:0] win0_vir_width
    Number of words of Win0 yrgb Virtual width
    ARGB888 : win0_vir_width
    RGB888 : (win0_vir_width*3/4) + (win0_vir_width%3)
    RGB565 : ceil(win0_vir_width/2)
    YUV : ceil(win0_vir_width/4)

Signed-off-by: default avatarMark Yao <mark.yao@rock-chips.com>
Reviewed-by: default avatarSandy huang <sandy.huang@rock-chips.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1501494591-7034-1-git-send-email-mark.yao@rock-chips.com
parent 6f04f592

drivers/gpu/drm/rockchip/rockchip_drm_vop.c

+2 −2
Original line number Diff line number Diff line
@@ -761,7 +761,7 @@ static void vop_plane_atomic_update(struct drm_plane *plane, 
	spin_lock(&vop->reg_lock);



	VOP_WIN_SET(vop, win, format, format);

	VOP_WIN_SET(vop, win, yrgb_vir, fb->pitches[0] >> 2);

	VOP_WIN_SET(vop, win, yrgb_vir, DIV_ROUND_UP(fb->pitches[0], 4));

	VOP_WIN_SET(vop, win, yrgb_mst, dma_addr);

	if (is_yuv_support(fb->format->format)) {

		int hsub = drm_format_horz_chroma_subsampling(fb->format->format);
@@ -775,7 +775,7 @@ static void vop_plane_atomic_update(struct drm_plane *plane, 
		offset += (src->y1 >> 16) * fb->pitches[1] / vsub;



		dma_addr = rk_uv_obj->dma_addr + offset + fb->offsets[1];

		VOP_WIN_SET(vop, win, uv_vir, fb->pitches[1] >> 2);

		VOP_WIN_SET(vop, win, uv_vir, DIV_ROUND_UP(fb->pitches[1], 4));

		VOP_WIN_SET(vop, win, uv_mst, dma_addr);

	}