From patchwork Tue Oct 2 14:27:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Stanislawski X-Patchwork-Id: 11935 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id D80461A52FC for ; Tue, 2 Oct 2012 14:29:40 +0000 (UTC) Received: from mail-ia0-f180.google.com (mail-ia0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 94D38A186F9 for ; Tue, 2 Oct 2012 14:29:40 +0000 (UTC) Received: by mail-ia0-f180.google.com with SMTP id f6so796283iag.11 for ; Tue, 02 Oct 2012 07:29:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:x-auditid :from:to:date:message-id:x-mailer:in-reply-to:references :x-brightmail-tracker:cc:subject:x-beenthere:x-mailman-version :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:sender:errors-to:x-gm-message-state; bh=4+o8tKlXycZGIPNrsndLl69va0BiVMQYeOhXkPVigO8=; b=A2oN7IG6VFwWKZVpdDsS2HUfxQgpXxG4Gd483YAZFLA4L6iofdAOtjcYvSxQSVYu7K peUbhnV1Vxdgz3vuV1K30hUlg5Ew+HslnQ5g0hAS3WaSLwLDpW1LIbziC9NCL45mEv/w SxLceehcFSir5da78Em83QU47zZgj3Q5ZvM5F8CahjO0UnaEzDJkwPeZDwCD32sRiEjZ yBoDr9loap/MGS14VthCSs8Ciinc9JrVEDiwGvdRlDpaMW/60Y/Ya6ZVm6fikJlG6Ihf ZlGtcqBg5H9WgSJnDHMOpqsWXqViuLZlfoJ/BtTNL6Xcov8WOb/JVo21TzIPEElGNIce +iaw== Received: by 10.50.160.165 with SMTP id xl5mr9097305igb.0.1349188180361; Tue, 02 Oct 2012 07:29:40 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp84999igc; Tue, 2 Oct 2012 07:29:39 -0700 (PDT) Received: by 10.180.91.71 with SMTP id cc7mr22396234wib.2.1349188178858; Tue, 02 Oct 2012 07:29:38 -0700 (PDT) Received: from mombin.canonical.com (mombin.canonical.com. [91.189.95.16]) by mx.google.com with ESMTP id q52si1356476wea.68.2012.10.02.07.29.37; Tue, 02 Oct 2012 07:29:38 -0700 (PDT) Received-SPF: neutral (google.com: 91.189.95.16 is neither permitted nor denied by best guess record for domain of linaro-mm-sig-bounces@lists.linaro.org) client-ip=91.189.95.16; Authentication-Results: mx.google.com; spf=neutral (google.com: 91.189.95.16 is neither permitted nor denied by best guess record for domain of linaro-mm-sig-bounces@lists.linaro.org) smtp.mail=linaro-mm-sig-bounces@lists.linaro.org Received: from localhost ([127.0.0.1] helo=mombin.canonical.com) by mombin.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TJ3Tc-0004l3-Pl; Tue, 02 Oct 2012 14:29:36 +0000 Received: from mailout1.samsung.com ([203.254.224.24]) by mombin.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TJ3Ta-0004kQ-BA for linaro-mm-sig@lists.linaro.org; Tue, 02 Oct 2012 14:29:34 +0000 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MB9009UJS8V3500@mailout1.samsung.com> for linaro-mm-sig@lists.linaro.org; Tue, 02 Oct 2012 23:29:33 +0900 (KST) X-AuditID: cbfee61a-b7f726d000000ec7-64-506afa4db713 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 90.AE.03783.D4AFA605; Tue, 02 Oct 2012 23:29:33 +0900 (KST) Received: from mcdsrvbld02.digital.local ([106.116.37.23]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MB9005A7S65K790@mmp2.samsung.com> for linaro-mm-sig@lists.linaro.org; Tue, 02 Oct 2012 23:29:33 +0900 (KST) From: Tomasz Stanislawski To: linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org Date: Tue, 02 Oct 2012 16:27:25 +0200 Message-id: <1349188056-4886-15-git-send-email-t.stanislaws@samsung.com> X-Mailer: git-send-email 1.7.10 In-reply-to: <1349188056-4886-1-git-send-email-t.stanislaws@samsung.com> References: <1349188056-4886-1-git-send-email-t.stanislaws@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrMJMWRmVeSWpSXmKPExsVy+t9jQV3fX1kBBice8lh8ufKQyYHR4/a/ x8wBjFFcNimpOZllqUX6dglcGTtO/GMu2Mhe8bWxh72BcRlbFyMnh4SAicTszc9YIWwxiQv3 1gPFuTiEBKYzSsxcMIMRwlnLJLHg0hcWkCo2oI5jSz4zgtgiAg4Sp+/OYgYpYhZYwyzxYuUN sLHCAp4S77f1MnUxcnCwCKhKXPzqDBLmFfCQ6H4+DWqbvMTT+31g5ZxA8Z9PLoDNFxJwl9iz vIltAiPvAkaGVYyiqQXJBcVJ6bmGesWJucWleel6yfm5mxjBXn8mtYNxZYPFIUYBDkYlHt6d JzMDhFgTy4orcw8xSnAwK4nwWt/PChDiTUmsrEotyo8vKs1JLT7EKM3BoiTO2+yREiAkkJ5Y kpqdmlqQWgSTZeLglGpgnP/Pc/bORLb9y1717rU8NC3lS375ipRW+2/Zqfrffr9wet3bf7fS kCfs5PeY/93llf+K4+4bJ3KWsT8Nt05T2hcl7aUYuaZdvuOA0rke8eVGa+L3/v2ptchA5oh5 yZvPvbuENWbskFh/yseubzXP753Hyt7Ftu8o9Ur2vuX26HK3+jE+c873SizFGYmGWsxFxYkA SlTX0PYBAAA= Cc: k.debski@samsung.com, s.nawrocki@samsung.com, pawel@osciak.com, sumit.semwal@ti.com, mchehab@redhat.com, robdclark@gmail.com, linaro-mm-sig@lists.linaro.org, kyungmin.park@samsung.com, laurent.pinchart@ideasonboard.com, airlied@redhat.com, remi@remlab.net Subject: [Linaro-mm-sig] [PATCHv9 14/25] v4l: s5p-tv: mixer: support for dmabuf importing X-BeenThere: linaro-mm-sig@lists.linaro.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Unified memory management interest group." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linaro-mm-sig-bounces@lists.linaro.org Errors-To: linaro-mm-sig-bounces@lists.linaro.org X-Gm-Message-State: ALoCoQm+OIZj7K4gVRBE2GprydKlMcFZP18jOGnLA2fdNCQgkOc7l8roL31vQjIysQjV0ngMnIsd This patch enhances s5p-tv with support for DMABUF importing via V4L2_MEMORY_DMABUF memory type. Signed-off-by: Tomasz Stanislawski Signed-off-by: Kyungmin Park --- drivers/media/video/s5p-tv/mixer_video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/video/s5p-tv/mixer_video.c b/drivers/media/video/s5p-tv/mixer_video.c index 6c74b05..2c299db 100644 --- a/drivers/media/video/s5p-tv/mixer_video.c +++ b/drivers/media/video/s5p-tv/mixer_video.c @@ -1078,7 +1078,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev, layer->vb_queue = (struct vb2_queue) { .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, - .io_modes = VB2_MMAP | VB2_USERPTR, + .io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF, .drv_priv = layer, .buf_struct_size = sizeof(struct mxr_buffer), .ops = &mxr_video_qops,