| Message ID | 1465199926-20991-1-git-send-email-ykk@rock-chips.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 2016年06月06日 15:58, Yakir Yang wrote: > From: Mark Yao <mark.yao@rock-chips.com> > > When the input color format is YUV, we need to do some external scale > for CBCR. Like, > * In YUV420 data format: > cbcr_xscale = dst_w / src_w * 2; > cbcr_yscale = dst_h / src_h * 2; > * In YUV422 data format: > cbcr_xscale = dst_w / src_w * 2; > cbcr_yscale = dst_h / src_h; > * In YUV444 data format > cbcr_xscale = dst_w / src_w; > cbcr_yscale = dst_h / src_h; > > Signed-off-by: Yakir Yang <ykk@rock-chips.com> > --- > drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > index 1c4d5b5..b28cda7 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > @@ -324,9 +324,9 @@ static void scl_vop_cal_scl_fac(struct vop *vop, const struct vop_win_data *win, > scl_cal_scale2(src_h, dst_h)); > if (is_yuv) { > VOP_SCL_SET(vop, win, scale_cbcr_x, > - scl_cal_scale2(src_w, dst_w)); > + scl_cal_scale2(cbcr_src_w, dst_w)); > VOP_SCL_SET(vop, win, scale_cbcr_y, > - scl_cal_scale2(src_h, dst_h)); > + scl_cal_scale2(cbcr_src_h, dst_h)); > } > return; > } Thanks for this fix, Applied to my drm-fixes.
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index 1c4d5b5..b28cda7 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -324,9 +324,9 @@ static void scl_vop_cal_scl_fac(struct vop *vop, const struct vop_win_data *win, scl_cal_scale2(src_h, dst_h)); if (is_yuv) { VOP_SCL_SET(vop, win, scale_cbcr_x, - scl_cal_scale2(src_w, dst_w)); + scl_cal_scale2(cbcr_src_w, dst_w)); VOP_SCL_SET(vop, win, scale_cbcr_y, - scl_cal_scale2(src_h, dst_h)); + scl_cal_scale2(cbcr_src_h, dst_h)); } return; }