From patchwork Wed Oct 10 14:46:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Stanislawski X-Patchwork-Id: 12124 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 4D1CD23EFB for ; Wed, 10 Oct 2012 14:57:37 +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 BCAB5A18890 for ; Wed, 10 Oct 2012 14:57:36 +0000 (UTC) Received: by mail-ia0-f180.google.com with SMTP id f6so421699iag.11 for ; Wed, 10 Oct 2012 07:57:36 -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=gG7i18cQV7Xm4f8WwS01DFb4Vbi4O5YjHZ/HwjcWvAY=; b=p0fKF9fAxfane6o9zXArc2nZR/7s+4ssrKvWHw/FE3IOmlG1xBXMG0EUgIgq9tm6Pu FBDsCgl6GYS3bmGG6tvDZyRDu8TKcGu6pq4RhwrlJr/LSGw+gsBEBjBsrOdWnXVBlvF8 40LU08dVQ5axPcWhsHBJaOtex2LLZveh7xD7rPvmQuWkVrN37kKPYnm5zkwJh5TJLUB5 EbTnMCk65/vRIrc/zxs3fWyYM8WguGAMnT6YGuHh7b8wFAmQhAvwWRA4IYfp4qpZtCqq E6P0kaeGdPGOagW8qLHNsDG6MUJtPgz1fKe0ETP5TQM1H871z/AHt172yCrWHSf7k1dD FCEQ== Received: by 10.50.91.195 with SMTP id cg3mr5489588igb.57.1349881056227; Wed, 10 Oct 2012 07:57:36 -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.67.148 with SMTP id n20csp236754igt; Wed, 10 Oct 2012 07:57:35 -0700 (PDT) Received: by 10.14.0.198 with SMTP id 46mr18742501eeb.21.1349881054413; Wed, 10 Oct 2012 07:57:34 -0700 (PDT) Received: from mombin.canonical.com (mombin.canonical.com. [91.189.95.16]) by mx.google.com with ESMTP id h44si1075251eeo.73.2012.10.10.07.57.33; Wed, 10 Oct 2012 07:57:34 -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 1TLxj2-00027m-BL; Wed, 10 Oct 2012 14:57:32 +0000 Received: from mailout4.samsung.com ([203.254.224.34]) by mombin.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TLxj0-00027a-Fn for linaro-mm-sig@lists.linaro.org; Wed, 10 Oct 2012 14:57:30 +0000 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MBO00BBVMVSK980@mailout4.samsung.com> for linaro-mm-sig@lists.linaro.org; Wed, 10 Oct 2012 23:57:28 +0900 (KST) X-AuditID: cbfee61a-b7f726d000000ec7-be-50758cd8e7ea Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 55.3A.03783.8DC85705; Wed, 10 Oct 2012 23:57:28 +0900 (KST) Received: from mcdsrvbld02.digital.local ([106.116.37.23]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MBO002YDME0EC70@mmp1.samsung.com> for linaro-mm-sig@lists.linaro.org; Wed, 10 Oct 2012 23:57:28 +0900 (KST) From: Tomasz Stanislawski To: linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org Date: Wed, 10 Oct 2012 16:46:34 +0200 Message-id: <1349880405-26049-16-git-send-email-t.stanislaws@samsung.com> X-Mailer: git-send-email 1.7.10 In-reply-to: <1349880405-26049-1-git-send-email-t.stanislaws@samsung.com> References: <1349880405-26049-1-git-send-email-t.stanislaws@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrCJMWRmVeSWpSXmKPExsVy+t9jAd0bPaUBBi09phZfrjxkcmD0uP3v MXMAYxSXTUpqTmZZapG+XQJXxuNPfxkLDgpU7P95gKWBcS5fFyMnh4SAicSltmWMELaYxIV7 69m6GLk4hAQWMUoce9bADOGsZZK4OPMkG0gVG1DHsSWfwTpEBBwkTt+dBVbELLCGWeLFyhtg RcICrhI7+v4yg9gsAqoSp27tYQexeQU8Jfaf6IdaJy/x9H4fWD0nUPzCvOlg9UICHhL/129m msDIu4CRYRWjaGpBckFxUnquoV5xYm5xaV66XnJ+7iZGsN+fSe1gXNlgcYhRgINRiYc3I6ok QIg1say4MvcQowQHs5IIr6lPaYAQb0piZVVqUX58UWlOavEhRmkOFiVx3maPlAAhgfTEktTs 1NSC1CKYLBMHp1QDo7vre3fZp/tdalWvSfB9bP235rDfgZnKP9w/6Bk15WaJ6IX+O3UmrG31 FbV1N3iMd71Qj7k0YT/H14ajC9LOyukqv/I96Phvkq2Os8WLnAPXmq/u/7rkwsKQgl9nvr56 xHjasP3AgYyqLVOdqzyZJkz/KiI+61YvV66klv2i1xonv7e1zsuc+l2JpTgj0VCLuag4EQCl O7iW9wEAAA== 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] [PATCHv10 15/26] v4l: s5p-fimc: 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: ALoCoQkup9g3D7DTsrWFR8WOWLowBhR+jNKqN1W1ysPktyUjwQ8K16Eqh3TPLfyP0nxAtYBU8LDM This patch enhances s5p-fimc with support for DMABUF importing via V4L2_MEMORY_DMABUF memory type. Signed-off-by: Tomasz Stanislawski Signed-off-by: Kyungmin Park Acked-by: Sylwester Nawrocki Acked-by: Hans Verkuil --- drivers/media/platform/s5p-fimc/fimc-capture.c | 2 +- drivers/media/platform/s5p-fimc/fimc-m2m.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/s5p-fimc/fimc-capture.c b/drivers/media/platform/s5p-fimc/fimc-capture.c index 367efd1..246bb32 100644 --- a/drivers/media/platform/s5p-fimc/fimc-capture.c +++ b/drivers/media/platform/s5p-fimc/fimc-capture.c @@ -1730,7 +1730,7 @@ static int fimc_register_capture_device(struct fimc_dev *fimc, q = &fimc->vid_cap.vbq; memset(q, 0, sizeof(*q)); q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; - q->io_modes = VB2_MMAP | VB2_USERPTR; + q->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF; q->drv_priv = fimc->vid_cap.ctx; q->ops = &fimc_capture_qops; q->mem_ops = &vb2_dma_contig_memops; diff --git a/drivers/media/platform/s5p-fimc/fimc-m2m.c b/drivers/media/platform/s5p-fimc/fimc-m2m.c index 4500e44..17067a7 100644 --- a/drivers/media/platform/s5p-fimc/fimc-m2m.c +++ b/drivers/media/platform/s5p-fimc/fimc-m2m.c @@ -622,7 +622,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq, int ret; src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE; - src_vq->io_modes = VB2_MMAP | VB2_USERPTR; + src_vq->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF; src_vq->drv_priv = ctx; src_vq->ops = &fimc_qops; src_vq->mem_ops = &vb2_dma_contig_memops; @@ -633,7 +633,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq, return ret; dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; - dst_vq->io_modes = VB2_MMAP | VB2_USERPTR; + dst_vq->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF; dst_vq->drv_priv = ctx; dst_vq->ops = &fimc_qops; dst_vq->mem_ops = &vb2_dma_contig_memops;