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: Fix a left_src_w calc error in splice mode

Browse Source 
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: I8900bfd1018dfcd5b47d857007a1d888dbe6c039
This commit is contained in:
Andy Yan
2021-11-27 19:07:30 +08:00
committed by Tao Huang
parent dcbe6022af
commit dfcff113be
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3667,15 +3667,19 @@ static void vop2_calc_drm_rect_for_splice(struct vop2_plane_state *vpstate,
struct drm_rect *src = &vpstate->src;
u16 half_hdisplay = mode->crtc_hdisplay >> 1;
int hscale = drm_rect_calc_hscale(src, dst, 0, INT_MAX);
int dsp_w = drm_rect_width(dst);
int dst_w = drm_rect_width(dst);
int src_w = drm_rect_width(src) >> 16;
int left_src_w, left_dst_w, right_dst_w;
left_dst_w = min_t(u16, half_hdisplay, dst->x2) - dst->x1;
if (left_dst_w < 0)
left_dst_w = 0;
right_dst_w = dsp_w - left_dst_w;
right_dst_w = dst_w - left_dst_w;
left_src_w = (left_dst_w * hscale) >> 16;
if (!right_dst_w)
left_src_w = src_w;
else
left_src_w = (left_dst_w * hscale) >> 16;
left_src->x1 = src->x1;
left_src->x2 = src->x1 + (left_src_w << 16);
left_dst->x1 = dst->x1;
@@ -3828,7 +3832,7 @@ static void vop2_win_atomic_update(struct vop2_win *win, struct drm_rect *src, s
vop2_win_enable(win);
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",
DRM_DEV_DEBUG(vop2->dev, "vp%d update %s[%dx%d->%dx%d@(%d, %d)] fmt[%.4s_%s] addr[%pad]\n",
vp->id, win->name, actual_w, actual_h, dsp_w, dsp_h,
dsp_stx, dsp_sty,
drm_get_format_name(fb->format->format, &format_name),
@@ -4004,7 +4008,7 @@ static void vop2_plane_atomic_update(struct drm_plane *plane, struct drm_plane_s
}
if (vcstate->splice_mode) {
DRM_DEV_DEBUG(vop2->dev, "vp%d update %s[%dx%d->%dx%d@%dx%d] fmt[%.4s_%s] addr[%pad]\n",
DRM_DEV_DEBUG(vop2->dev, "vp%d update %s[%dx%d->%dx%d@(%d,%d)] fmt[%.4s_%s] addr[%pad]\n",
vp->id, win->name, drm_rect_width(&vpstate->src) >> 16,
drm_rect_height(&vpstate->src) >> 16,
drm_rect_width(&vpstate->dest), drm_rect_height(&vpstate->dest),