From patchwork Tue Aug 14 15:34:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Stanislawski X-Patchwork-Id: 10746 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 50EAC23F46 for ; Tue, 14 Aug 2012 15:37:49 +0000 (UTC) Received: from mail-gg0-f180.google.com (mail-gg0-f180.google.com [209.85.161.180]) by fiordland.canonical.com (Postfix) with ESMTP id EFBF7A18A3C for ; Tue, 14 Aug 2012 15:37:48 +0000 (UTC) Received: by ggmi2 with SMTP id i2so623349ggm.11 for ; Tue, 14 Aug 2012 08:37:48 -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:x-tm-as-mml: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=BBWOWKMoot3KVze5rq6v+bMrlOB+kWbTLshWPLxtIXg=; b=W1ywfFpBuh71cD6p6HMp9MqrFvKlgZd5kz1gpbguEPYlvdWUo4wBygtpz8mdt3U8L/ kg8GjByDURyEgVfqZslNanzkSBXhghdeg2JJo0+RmNheWsAiixaehAyE7x6eMxXYRpzM 4WoA1xuImyehQkizqksZQUpQbzimb4PeXQaDXgl0qyzx2dG5TpKHYpk1SxDX5BtmoahA Lgz32sZrkRIEZTcMiwzJa5XdpdfxeZI8v4ekrfhdbuAOmeGJhPhWAwxt2BSYfDHDMXGY Ptgmgpitz46R6ZPxqBqckS8qqIjlO8ai0G5YyK2U5myKM9cibFsoAydPjjB2N2KlTY5Z E1ZA== Received: by 10.50.170.3 with SMTP id ai3mr558224igc.9.1344958667371; Tue, 14 Aug 2012 08:37:47 -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.200 with SMTP id ew8csp20662igc; Tue, 14 Aug 2012 08:37:46 -0700 (PDT) Received: by 10.204.0.80 with SMTP id 16mr6448097bka.71.1344958665952; Tue, 14 Aug 2012 08:37:45 -0700 (PDT) Received: from mombin.canonical.com (mombin.canonical.com. [91.189.95.16]) by mx.google.com with ESMTP id ic15si3972105bkc.147.2012.08.14.08.37.44; Tue, 14 Aug 2012 08:37:45 -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 1T1JBf-0008SB-LJ; Tue, 14 Aug 2012 15:37:43 +0000 Received: from mailout2.samsung.com ([203.254.224.25]) by mombin.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1T1JBd-0008Rq-L4 for linaro-mm-sig@lists.linaro.org; Tue, 14 Aug 2012 15:37:41 +0000 Received: from epcpsbgm2.samsung.com (mailout2.samsung.com [203.254.224.25]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0M8R004GG4PHIRG0@mailout2.samsung.com> for linaro-mm-sig@lists.linaro.org; Wed, 15 Aug 2012 00:37:01 +0900 (KST) X-AuditID: cbfee61b-b7faf6d00000476a-86-502a709dd6a4 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id DD.F9.18282.D907A205; Wed, 15 Aug 2012 00:37:01 +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 <0M8R004J44MBC810@mmp1.samsung.com> for linaro-mm-sig@lists.linaro.org; Wed, 15 Aug 2012 00:37:01 +0900 (KST) From: Tomasz Stanislawski To: linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org Date: Tue, 14 Aug 2012 17:34:44 +0200 Message-id: <1344958496-9373-15-git-send-email-t.stanislaws@samsung.com> X-Mailer: git-send-email 1.7.10 In-reply-to: <1344958496-9373-1-git-send-email-t.stanislaws@samsung.com> References: <1344958496-9373-1-git-send-email-t.stanislaws@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrMJMWRmVeSWpSXmKPExsVy+t9jAd25BVoBBgcn8lt8ufKQyYHR4/a/ x8wBjFFcNimpOZllqUX6dglcGScWfGUruMBd0XHtJnMD4yvOLkZODgkBE4k/k2YxQ9hiEhfu rWfrYuTiEBJYxCix4+hNZghnLZPE72Xz2ECq2IA6ji35zAhiiwg4SJy+OwusiFngELPE/t7X 7CAJYQFPiZ6Vd8GKWARUJf7e384CYvMKeEjsvruRHWKdvMTT+31gQzmB4i83dQPVcwBtc5dY +NN/AiPvAkaGVYyiqQXJBcVJ6blGesWJucWleel6yfm5mxjBXn8mvYNxVYPFIUYBDkYlHt7C RM0AIdbEsuLK3EOMEhzMSiK8RUFaAUK8KYmVValF+fFFpTmpxYcYpTlYlMR5Tby/+gsJpCeW pGanphakFsFkmTg4pRoY7U6s0pji8nzOh50ijAI8slynlX7lR32Pj9GaEbLLV3Omn6D9zc5I 3eO7LQ4vu/Ny1Z/l2dUPzL4f+rls76ONP1Pn6okeSeNT1F3hVPKesWZlS96c0DuTWxjkXrXc cp9+LOPy0mf5bb/Z78xVEink0krrWhUv1yqSz/fcvmFS9dttUy6LsXzarsRSnJFoqMVcVJwI AJYiT6D2AQAA X-TM-AS-MML: No Cc: k.debski@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, dmitriyz@google.com, laurent.pinchart@ideasonboard.com, s.nawrocki@samsung.com, airlied@redhat.com, remi@remlab.net, g.liakhovetski@gmx.de Subject: [Linaro-mm-sig] [PATCHv8 14/26] 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: ALoCoQl42AnljhZceJeGiAPH6AWCwrjCfEfjupE09Q/gE50g7qz3hkpPb/vKPn0oaMbXhoTn1BI7 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/Kconfig | 1 + drivers/media/video/s5p-tv/mixer_video.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/media/video/s5p-tv/Kconfig b/drivers/media/video/s5p-tv/Kconfig index f248b28..2e80126 100644 --- a/drivers/media/video/s5p-tv/Kconfig +++ b/drivers/media/video/s5p-tv/Kconfig @@ -10,6 +10,7 @@ config VIDEO_SAMSUNG_S5P_TV bool "Samsung TV driver for S5P platform (experimental)" depends on PLAT_S5P && PM_RUNTIME depends on EXPERIMENTAL + select DMA_SHARED_BUFFER default n ---help--- Say Y here to enable selecting the TV output devices for diff --git a/drivers/media/video/s5p-tv/mixer_video.c b/drivers/media/video/s5p-tv/mixer_video.c index e0e02cc..da5b7a5 100644 --- a/drivers/media/video/s5p-tv/mixer_video.c +++ b/drivers/media/video/s5p-tv/mixer_video.c @@ -1091,7 +1091,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,