From 585789020ef8895ee31ca2d526dcd2d8882006aa Mon Sep 17 00:00:00 2001 From: Andy Yan Date: Mon, 17 May 2021 10:51:08 +0800 Subject: [PATCH] drm/rockchip: vop2: configure half_block_en bit in all mode First we thought the half_block_en bit in AFBCD_CTRL register only work in afbc mode. But the fact is it control the line buffer in all mode(afbc/tile/line), so we need configure it in the all case. Signed-off-by: Andy Yan Change-Id: Ib8cd5fbfd0a898eea738423685fbcdc0ab6d00ad --- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index f8d9855f79de..7cd899f89d49 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -3134,6 +3134,8 @@ static void vop2_plane_atomic_update(struct drm_plane *plane, struct drm_plane_s vop2_setup_csc_mode(vp, vpstate); + afbc_half_block_en = vop2_afbc_half_block_enable(vpstate); + spin_lock(&vop2->reg_lock); DRM_DEV_DEBUG(vop2->dev, "vp%d update %s[%dx%d->%dx%d@%dx%d] fmt[%.4s_%s] addr[%pad]\n", vp->id, win->name, actual_w, actual_h, dsp_w, dsp_h, @@ -3159,7 +3161,6 @@ static void vop2_plane_atomic_update(struct drm_plane *plane, struct drm_plane_s rb_swap = vop2_afbc_rb_swap(fb->format->format); uv_swap = vop2_afbc_uv_swap(fb->format->format); - afbc_half_block_en = vop2_afbc_half_block_enable(vpstate); vpstate->afbc_half_block_en = afbc_half_block_en; transform_offset = vop2_afbc_transform_offset(vpstate); VOP_CLUSTER_SET(vop2, win, afbc_enable, 1); @@ -3168,7 +3169,6 @@ static void vop2_plane_atomic_update(struct drm_plane *plane, struct drm_plane_s VOP_AFBC_SET(vop2, win, uv_swap, uv_swap); VOP_AFBC_SET(vop2, win, auto_gating_en, 0); VOP_AFBC_SET(vop2, win, block_split_en, 0); - VOP_AFBC_SET(vop2, win, half_block_en, afbc_half_block_en); VOP_AFBC_SET(vop2, win, hdr_ptr, vpstate->yrgb_mst); VOP_AFBC_SET(vop2, win, pic_size, act_info); VOP_AFBC_SET(vop2, win, transform_offset, transform_offset); @@ -3192,6 +3192,9 @@ static void vop2_plane_atomic_update(struct drm_plane *plane, struct drm_plane_s actual_h = drm_rect_width(src) >> 16; } + /* rk3588 should set half_blocK_en to 1 in line and tile mode */ + VOP_AFBC_SET(vop2, win, half_block_en, afbc_half_block_en); + VOP_WIN_SET(vop2, win, format, format); /* win->yrgb_vir only take effect at non-afbc mode */ VOP_WIN_SET(vop2, win, yrgb_vir, stride);