* [PATCH 1/2] drm/rockchip: vop: add uv_vir register field for RK3036 VOP
@ 2016-06-06 7:58 Yakir Yang
2016-06-06 7:58 ` [PATCH 2/2] drm/rockchip: vop: correct the source size of uv scale factor setting Yakir Yang
2016-06-07 0:57 ` [PATCH 1/2] drm/rockchip: vop: add uv_vir register field for RK3036 VOP Mark yao
0 siblings, 2 replies; 4+ messages in thread
From: Yakir Yang @ 2016-06-06 7:58 UTC (permalink / raw)
To: Mark Yao, Heiko Stuebner, David Airlie
Cc: tfiga, dri-devel, linux-arm-kernel, linux-rockchip, linux-kernel,
Yakir Yang
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 <ykk@rock-chips.com>
---
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 = {
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] drm/rockchip: vop: correct the source size of uv scale factor setting
2016-06-06 7:58 [PATCH 1/2] drm/rockchip: vop: add uv_vir register field for RK3036 VOP Yakir Yang
@ 2016-06-06 7:58 ` Yakir Yang
2016-06-07 0:57 ` Mark yao
2016-06-07 0:57 ` [PATCH 1/2] drm/rockchip: vop: add uv_vir register field for RK3036 VOP Mark yao
1 sibling, 1 reply; 4+ messages in thread
From: Yakir Yang @ 2016-06-06 7:58 UTC (permalink / raw)
To: Mark Yao, Heiko Stuebner, David Airlie
Cc: tfiga, dri-devel, linux-arm-kernel, linux-rockchip, linux-kernel,
Mark Yao, Yakir Yang
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;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 2/2] drm/rockchip: vop: correct the source size of uv scale factor setting
2016-06-06 7:58 ` [PATCH 2/2] drm/rockchip: vop: correct the source size of uv scale factor setting Yakir Yang
@ 2016-06-07 0:57 ` Mark yao
0 siblings, 0 replies; 4+ messages in thread
From: Mark yao @ 2016-06-07 0:57 UTC (permalink / raw)
To: Yakir Yang, Mark Yao, Heiko Stuebner, David Airlie
Cc: tfiga, dri-devel, linux-arm-kernel, linux-rockchip, linux-kernel
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.
--
Ｍark Yao
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] drm/rockchip: vop: add uv_vir register field for RK3036 VOP
2016-06-06 7:58 [PATCH 1/2] drm/rockchip: vop: add uv_vir register field for RK3036 VOP Yakir Yang
2016-06-06 7:58 ` [PATCH 2/2] drm/rockchip: vop: correct the source size of uv scale factor setting Yakir Yang
@ 2016-06-07 0:57 ` Mark yao
1 sibling, 0 replies; 4+ messages in thread
From: Mark yao @ 2016-06-07 0:57 UTC (permalink / raw)
To: Yakir Yang, Mark Yao, Heiko Stuebner, David Airlie
Cc: linux-kernel, dri-devel, tfiga, linux-rockchip, linux-arm-kernel
On 2016年06月06日 15:58, Yakir Yang wrote:
> 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 <ykk@rock-chips.com>
> ---
> 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 = {
Thanks for this fix, Applied to my drm-fixes.
-- Ｍark Yao
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-06-07 0:58 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-06 7:58 [PATCH 1/2] drm/rockchip: vop: add uv_vir register field for RK3036 VOP Yakir Yang
2016-06-06 7:58 ` [PATCH 2/2] drm/rockchip: vop: correct the source size of uv scale factor setting Yakir Yang
2016-06-07 0:57 ` Mark yao
2016-06-07 0:57 ` [PATCH 1/2] drm/rockchip: vop: add uv_vir register field for RK3036 VOP Mark yao
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).