shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

drm/rockchip: vop2: configure half_block_en bit in all mode

Browse Source 
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 <andy.yan@rock-chips.com>
Change-Id: Ib8cd5fbfd0a898eea738423685fbcdc0ab6d00ad
This commit is contained in:
Andy Yan
2021-05-17 10:51:08 +08:00
committed by Tao Huang
parent 240d8a3bd7
commit 585789020e
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
View File

@@ -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);