From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark yao Subject: Re: [PATCH 2/2] drm/rockchip: vop: correct the source size of uv scale factor setting Date: Tue, 7 Jun 2016 08:57:48 +0800 Message-ID: <57561C0C.2040507@rock-chips.com> References: <1465199912-20932-1-git-send-email-ykk@rock-chips.com> <1465199926-20991-1-git-send-email-ykk@rock-chips.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1465199926-20991-1-git-send-email-ykk@rock-chips.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Yakir Yang , Mark Yao , Heiko Stuebner , David Airlie Cc: linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, tfiga@chromium.org List-Id: linux-rockchip.vger.kernel.org T24gMjAxNuW5tDA25pyIMDbml6UgMTU6NTgsIFlha2lyIFlhbmcgd3JvdGU6Cj4gRnJvbTogTWFy ayBZYW8gPG1hcmsueWFvQHJvY2stY2hpcHMuY29tPgo+Cj4gV2hlbiB0aGUgaW5wdXQgY29sb3Ig Zm9ybWF0IGlzIFlVViwgd2UgbmVlZCB0byBkbyBzb21lIGV4dGVybmFsIHNjYWxlCj4gZm9yIENC Q1IuIExpa2UsCj4gICAqIEluIFlVVjQyMCBkYXRhIGZvcm1hdDoKPiAgICAgICBjYmNyX3hzY2Fs ZSA9IGRzdF93IC8gc3JjX3cgKiAyOwo+ICAgICAgIGNiY3JfeXNjYWxlID0gZHN0X2ggLyBzcmNf aCAqIDI7Cj4gICAqIEluIFlVVjQyMiBkYXRhIGZvcm1hdDoKPiAgICAgICBjYmNyX3hzY2FsZSA9 IGRzdF93IC8gc3JjX3cgKiAyOwo+ICAgICAgIGNiY3JfeXNjYWxlID0gZHN0X2ggLyBzcmNfaDsK PiAgICogSW4gWVVWNDQ0IGRhdGEgZm9ybWF0Cj4gICAgICAgY2Jjcl94c2NhbGUgPSBkc3RfdyAv IHNyY193Owo+ICAgICAgIGNiY3JfeXNjYWxlID0gZHN0X2ggLyBzcmNfaDsKPgo+IFNpZ25lZC1v ZmYtYnk6IFlha2lyIFlhbmcgPHlra0Byb2NrLWNoaXBzLmNvbT4KPiAtLS0KPiAgIGRyaXZlcnMv Z3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fdm9wLmMgfCA0ICsrLS0KPiAgIDEgZmlsZSBj aGFuZ2VkLCAyIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCj4KPiBkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL3JvY2tjaGlwX2RybV92b3AuYyBiL2RyaXZlcnMvZ3B1 L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fdm9wLmMKPiBpbmRleCAxYzRkNWI1Li5iMjhjZGE3 IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fdm9w LmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX3ZvcC5jCj4g QEAgLTMyNCw5ICszMjQsOSBAQCBzdGF0aWMgdm9pZCBzY2xfdm9wX2NhbF9zY2xfZmFjKHN0cnVj dCB2b3AgKnZvcCwgY29uc3Qgc3RydWN0IHZvcF93aW5fZGF0YSAqd2luLAo+ICAgCQkJICAgIHNj bF9jYWxfc2NhbGUyKHNyY19oLCBkc3RfaCkpOwo+ICAgCQlpZiAoaXNfeXV2KSB7Cj4gICAJCQlW T1BfU0NMX1NFVCh2b3AsIHdpbiwgc2NhbGVfY2Jjcl94LAo+IC0JCQkJICAgIHNjbF9jYWxfc2Nh bGUyKHNyY193LCBkc3RfdykpOwo+ICsJCQkJICAgIHNjbF9jYWxfc2NhbGUyKGNiY3Jfc3JjX3cs IGRzdF93KSk7Cj4gICAJCQlWT1BfU0NMX1NFVCh2b3AsIHdpbiwgc2NhbGVfY2Jjcl95LAo+IC0J CQkJICAgIHNjbF9jYWxfc2NhbGUyKHNyY19oLCBkc3RfaCkpOwo+ICsJCQkJICAgIHNjbF9jYWxf c2NhbGUyKGNiY3Jfc3JjX2gsIGRzdF9oKSk7Cj4gICAJCX0KPiAgIAkJcmV0dXJuOwo+ICAgCX0K VGhhbmtzIGZvciB0aGlzIGZpeCwgQXBwbGllZCB0byBteSBkcm0tZml4ZXMuCgotLSAK77ytYXJr IFlhbwoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRy aS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: mark.yao@rock-chips.com (Mark yao) Date: Tue, 7 Jun 2016 08:57:48 +0800 Subject: [PATCH 2/2] drm/rockchip: vop: correct the source size of uv scale factor setting In-Reply-To: <1465199926-20991-1-git-send-email-ykk@rock-chips.com> References: <1465199912-20932-1-git-send-email-ykk@rock-chips.com> <1465199926-20991-1-git-send-email-ykk@rock-chips.com> Message-ID: <57561C0C.2040507@rock-chips.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 2016?06?06? 15:58, Yakir Yang wrote: > From: Mark Yao > > 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 > --- > 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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753850AbcFGA6A (ORCPT ); Mon, 6 Jun 2016 20:58:00 -0400 Received: from regular1.263xmail.com ([211.150.99.140]:52647 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752040AbcFGA56 (ORCPT ); Mon, 6 Jun 2016 20:57:58 -0400 X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 4 X-ADDR-CHECKED: 0 X-RL-SENDER: mark.yao@rock-chips.com X-FST-TO: linux-kernel@vger.kernel.org X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: mark.yao@rock-chips.com X-UNIQUE-TAG: X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 Subject: Re: [PATCH 2/2] drm/rockchip: vop: correct the source size of uv scale factor setting To: Yakir Yang , Mark Yao , Heiko Stuebner , David Airlie References: <1465199912-20932-1-git-send-email-ykk@rock-chips.com> <1465199926-20991-1-git-send-email-ykk@rock-chips.com> Cc: tfiga@chromium.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org From: Mark yao Message-ID: <57561C0C.2040507@rock-chips.com> Date: Tue, 7 Jun 2016 08:57:48 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <1465199926-20991-1-git-send-email-ykk@rock-chips.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2016年06月06日 15:58, Yakir Yang wrote: > From: Mark Yao > > 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 > --- > 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