From patchwork Tue Oct 2 14:27:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Stanislawski X-Patchwork-Id: 11936 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 4C7A61A52FC for ; Tue, 2 Oct 2012 14:29:46 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id F2AA1A186E7 for ; Tue, 2 Oct 2012 14:29:45 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so14258231iej.11 for ; Tue, 02 Oct 2012 07:29:45 -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=p2ysnuzNIYFZQ5mABxK6N2mvRkvY6XGFSHmu8iS9C8M=; b=COc64GYi92UoYUJEZAQ0nswZsiah++AOJfNcCyhQH5JiYcLfIMVS0w1/d0MS1KH69e EQDOfXuuvWZDqR0Z42oyaGESsHrJFy9zPruAtX/ueYdZofDXfLVmeP9xuVe8R/oECnI0 0SQCIFZmWyqsUxBJXzC8tEtmFUl75zQsLco5QYP6nIg93guZcGUV3s/oNEtAhYHHEiaJ MSzV8JyJ6ZZKBtUD3NX2OciLyiZuM9djyLFJLZi1vqFwoiHttGSfT5/ulMVlsoJ8Yfu9 HoK5gxrPDucl2mTTWJCM80iUHhKMt8VGZSl9e3FoLhxBncjtpraKNAWwLFzDQQ/vuhf6 F79g== Received: by 10.50.154.227 with SMTP id vr3mr8943405igb.43.1349188185765; Tue, 02 Oct 2012 07:29:45 -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 ex8csp85003igc; Tue, 2 Oct 2012 07:29:45 -0700 (PDT) Received: by 10.180.101.230 with SMTP id fj6mr17423852wib.16.1349188184159; Tue, 02 Oct 2012 07:29:44 -0700 (PDT) Received: from mombin.canonical.com (mombin.canonical.com. [91.189.95.16]) by mx.google.com with ESMTP id fj2si2512993wib.47.2012.10.02.07.29.43; Tue, 02 Oct 2012 07:29:44 -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 1TJ3Ti-0004ly-74; Tue, 02 Oct 2012 14:29:42 +0000 Received: from mailout1.samsung.com ([203.254.224.24]) by mombin.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TJ3Th-0004lj-2j for linaro-mm-sig@lists.linaro.org; Tue, 02 Oct 2012 14:29:41 +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 <0MB9006Y9S9F9XL0@mailout1.samsung.com> for linaro-mm-sig@lists.linaro.org; Tue, 02 Oct 2012 23:29:39 +0900 (KST) X-AuditID: cbfee61a-b7f726d000000ec7-71-506afa536627 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 32.AE.03783.35AFA605; Tue, 02 Oct 2012 23:29:39 +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:39 +0900 (KST) From: Tomasz Stanislawski To: linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org Date: Tue, 02 Oct 2012 16:27:26 +0200 Message-id: <1349188056-4886-16-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+NgFnrEJMWRmVeSWpSXmKPExsVy+t9jQd3gX1kBBg13LSy+XHnI5MDocfvf Y+YAxigum5TUnMyy1CJ9uwSujGUTVjEX9HJULH2/mLWBsZm9i5GTQ0LARKJh+ismCFtM4sK9 9WwgtpDAdEaJqY9Uuhi5gOy1TBLXHl9lAUmwATUcW/KZEcQWEXCQOH13FjNIEbPAGmaJFytv gHULC7hI9E3aDrSBg4NFQFXi5RcpkDCvgIfE3as/oJbJSzy93wdWzgkU//nkAgvEYneJPcub 2CYw8i5gZFjFKJpakFxQnJSea6hXnJhbXJqXrpecn7uJEezzZ1I7GFc2WBxiFOBgVOLh3Xky M0CINbGsuDL3EKMEB7OSCK/1/awAId6UxMqq1KL8+KLSnNTiQ4zSHCxK4rzNHikBQgLpiSWp 2ampBalFMFkmDk6pBkZTpYOl6c/ftTqFqzb/N2Qrchc7OVXkg/zEsPqDpy2k+fTPrOu0tOmb pq4h8G1pWYGC77zFjQ6TNM3l4jLUIiRNQlr13T4br4uOvPs7mYmP54Ktn13L34UZDTNzHPcy 7PisvHNemr/sw52HwuYuzmd8Ne/s47WvXZO/Bi1trv11bEVxx8UrG5RYijMSDbWYi4oTAUh/ CLP1AQAA 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 15/25] 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: ALoCoQkZ4P6r8RIZfMOLgdyt2HOlsBFaeOk45L4n7DhoHCpkeuModMQtPZ1Ovt0tFsGFJhsiuKJp 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 --- drivers/media/video/s5p-fimc/fimc-capture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/video/s5p-fimc/fimc-capture.c b/drivers/media/video/s5p-fimc/fimc-capture.c index 8e413dd..3fcaf7d 100644 --- a/drivers/media/video/s5p-fimc/fimc-capture.c +++ b/drivers/media/video/s5p-fimc/fimc-capture.c @@ -1634,7 +1634,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;