[PATCH 1/2] drm/rockchip: vop: add uv_vir register field for RK3036 VOP

The WIN0 of RK3036 VOP could support YUV data format, but driver
forget to add the uv_vir register field for it.

Signed-off-by: Yakir Yang <redacted>
---
  drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 1 +
  1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
index 3166b46..7da2311 100644
--- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
+++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c

@@ -210,6 +210,7 @@ static const struct vop_win_phy rk3036_win0_data = {
  	.yrgb_mst = VOP_REG(RK3036_WIN0_YRGB_MST, 0xffffffff, 0),
  	.uv_mst = VOP_REG(RK3036_WIN0_CBR_MST, 0xffffffff, 0),
  	.yrgb_vir = VOP_REG(RK3036_WIN0_VIR, 0xffff, 0),
+	.uv_vir = VOP_REG(RK3036_WIN0_VIR, 0x1fff, 16),
  };
  
  static const struct vop_win_phy rk3036_win1_data = {

From: Mark Yao <redacted>

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 <redacted>
---
  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;
  	}