Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754662AbbGWCCQ (ORCPT ); Wed, 22 Jul 2015 22:02:16 -0400 Received: from regular1.263xmail.com ([211.150.99.140]:50637 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753862AbbGWCCL (ORCPT ); Wed, 22 Jul 2015 22:02:11 -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: heiko@sntech.de X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: mark.yao@rock-chips.com X-UNIQUE-TAG: <5348f2136af2a85934af837420d8df46> X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 Message-ID: <55B04B16.7030005@rock-chips.com> Date: Thu, 23 Jul 2015 10:01:58 +0800 From: Mark yao User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 MIME-Version: 1.0 To: =?UTF-8?B?SGVpa28gU3TDvGJuZXI=?= CC: dri-devel@lists.freedesktop.org, David Airlie , Daniel Kurtz , Philipp Zabel , Daniel Vetter , Rob Clark , tfiga@chromium.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, sandy.huang@rock-chips.com, dkm@rock-chips.com, zwl@rock-chips.com, xw@rock-chips.com Subject: Re: [PATCH v3 3/6] drm/rockchip: vop: Add yuv plane support References: <1437466807-13689-1-git-send-email-mark.yao@rock-chips.com> <1437466807-13689-4-git-send-email-mark.yao@rock-chips.com> <7451281.fUv3gEKea6@diego> In-Reply-To: <7451281.fUv3gEKea6@diego> 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 Content-Length: 2949 Lines: 103 On 2015年07月23日 05:51, Heiko Stübner wrote: > Am Dienstag, 21. Juli 2015, 16:20:04 schrieb Mark Yao: >> vop support yuv with NV12, NV16 and NV24, only 2 plane yuv. >> >> Signed-off-by: Mark Yao >> --- >> Changes in v3: >> Adviced by Tomasz Figa >> - separate dest calculate to another patch >> - fix src x1,x2 when do align, and remove unnecessary src.y1 align. >> >> Changes in v2: >> - Uv buffer not support odd offset, align it. >> - Fix error display when move yuv image. >> >> drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 56 >> ++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 2 >> deletions(-) >> >> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c >> b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index c7e0283..47ce943 100644 >> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c >> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c >> @@ -373,6 +373,18 @@ static enum vop_data_format vop_convert_format(uint32_t >> format) } >> } >> >> +static bool is_yuv_support(uint32_t format) >> +{ >> + switch (format) { >> + case DRM_FORMAT_NV12: >> + case DRM_FORMAT_NV16: >> + case DRM_FORMAT_NV24: >> + return true; >> + default: >> + return false; >> + } >> +} >> + >> static bool is_alpha_support(uint32_t format) >> { >> switch (format) { >> @@ -577,16 +589,21 @@ static int vop_update_plane_event(struct drm_plane > > does not apply to what's in mainline, as this patch seems to ignore > 85a359f25388 ("drm/rockchip: Add BGR formats to VOP") > from Tomasz > Hmm, I found the patch ("drm/rockchip: Add BGR formats to VOP") is on the drm-fixes branch, so I didn't resend the patch. Ok, I will rebase these patches top of the "Add BGR formats to VOP". >> *plane, struct vop *vop = to_vop(crtc); >> struct drm_gem_object *obj; >> struct rockchip_gem_object *rk_obj; >> + struct drm_gem_object *uv_obj; >> + struct rockchip_gem_object *rk_uv_obj; >> unsigned long offset; >> unsigned int actual_w; >> unsigned int actual_h; >> unsigned int dsp_stx; >> unsigned int dsp_sty; >> unsigned int y_vir_stride; >> + unsigned int uv_vir_stride = 0; >> dma_addr_t yrgb_mst; >> + dma_addr_t uv_mst = 0; >> enum vop_data_format format; >> uint32_t val; >> bool is_alpha; >> + bool is_yuv; >> bool visible; >> int ret; >> struct drm_rect dest = { >> @@ -620,6 +637,8 @@ static int vop_update_plane_event(struct drm_plane >> *plane, return 0; >> >> is_alpha = is_alpha_support(fb->pixel_format); >> + is_yuv = is_yuv_support(fb->pixel_format); >> + >> format = vop_convert_format(fb->pixel_format); >> if (format < 0) >> return format; > same as above > > > Heiko > > > -- Mark -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/