From patchwork Wed Oct 10 14:46:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Stanislawski X-Patchwork-Id: 12123 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 3C88423EFB for ; Wed, 10 Oct 2012 14:56:52 +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 CB3D4A18444 for ; Wed, 10 Oct 2012 14:56:51 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so1010793iej.11 for ; Wed, 10 Oct 2012 07:56:51 -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=TDm8kc8FcwT+VJh9X+xDoDEiaSKpUV7EUct1H4PLKlA=; b=fpKSd52VgUoev0nkf/wDWyfcuXaXcdNXg75uu7mD0fTwEPFEgDACiaV0DgSN9C3laB rhmqlfP4YoMYl6rouRBI9Gu5G/SYc7f4O2ws+e82dYJYuk277SIJhSAme7FHZny63q1s GQxsPPsRwg+TXdOxVo+2/Ggi0II0iXVLVENYRBDn8iTdgZ+egDTz4MrNjTejypXYq39H +dm7syvwMTtPNWx/gJxBo9SzWlsso/IjgjwET+hQE1srMkiKQsiyHXV2Q9/r3vxmVH6v CHciuzgXvUpZ5/o8zDsqFNUP8/zjUHJDfogex0tMNoBIbFQHSPgiAq8U/UxK8TrwQVeK PWww== Received: by 10.42.145.66 with SMTP id e2mr18616115icv.18.1349881011291; Wed, 10 Oct 2012 07:56:51 -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 n20csp236643igt; Wed, 10 Oct 2012 07:56:50 -0700 (PDT) Received: by 10.204.150.220 with SMTP id z28mr8339828bkv.125.1349881009313; Wed, 10 Oct 2012 07:56:49 -0700 (PDT) Received: from mombin.canonical.com (mombin.canonical.com. [91.189.95.16]) by mx.google.com with ESMTP id fv4si2874750bkc.2.2012.10.10.07.56.48; Wed, 10 Oct 2012 07:56:49 -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 1TLxiI-0001rd-WF; Wed, 10 Oct 2012 14:56:47 +0000 Received: from mailout2.samsung.com ([203.254.224.25]) by mombin.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TLxiH-0001rU-Gq for linaro-mm-sig@lists.linaro.org; Wed, 10 Oct 2012 14:56:45 +0000 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MBO00GJRMUKP590@mailout2.samsung.com> for linaro-mm-sig@lists.linaro.org; Wed, 10 Oct 2012 23:56:44 +0900 (KST) X-AuditID: cbfee61a-b7f726d000000ec7-6c-50758cac4460 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 53.2A.03783.CAC85705; Wed, 10 Oct 2012 23:56:44 +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:56:44 +0900 (KST) From: Tomasz Stanislawski To: linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org Date: Wed, 10 Oct 2012 16:46:33 +0200 Message-id: <1349880405-26049-15-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+NgFnrMJMWRmVeSWpSXmKPExsVy+t9jAd01PaUBBouOSlt8ufKQyYHR4/a/ x8wBjFFcNimpOZllqUX6dglcGXPXbWUs+MResfjMZ9YGxkdsXYycHBICJhIff+xnhbDFJC7c Ww8U5+IQEljEKPFkawcLSEJIYC2TxP17DiA2G1DDsSWfGUFsEQEHidN3ZzGDNDALrGGWeLHy BthUYQEviYX9Z5lAbBYBVYkNT04wg9i8Ap4SP2dcZILYJi/x9H4fWD0nUPzCvOnMEMs8JP6v 38w0gZF3ASPDKkbR1ILkguKk9FxDveLE3OLSvHS95PzcTYxgrz+T2sG4ssHiEKMAB6MSD29G VEmAEGtiWXFl7iFGCQ5mJRFeU5/SACHelMTKqtSi/Pii0pzU4kOM0hwsSuK8zR4pAUIC6Ykl qdmpqQWpRTBZJg5OqQbGCC3OtlWXskQlQp7NfBz4NXLZwfyD37R8PF8bMXowFjzi8Q4z+i1w wVKIYS9HbPvtWYUNB57ILdzfVG/72tOn4FyjgeiM5bd3f26z6ln3Msz535MV/RNmhsRPjtc4 Jq8y+f5dxcp1n/SVnW3ag/ZWnawMkNn3lJv/mWCp6ffNHlz8lZ59afOUWIozEg21mIuKEwHB S6lk9gEAAA== 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 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: ALoCoQmBq4HANSQdD8kuESxtcCzHCqdAdoxg3hOfKWoFeHXg2JU82ue6GXGu557i26vXr1vsKVDT 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 Acked-by: Hans Verkuil --- drivers/media/platform/s5p-tv/mixer_video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c index 0c1cd89..2421e527 100644 --- a/drivers/media/platform/s5p-tv/mixer_video.c +++ b/drivers/media/platform/s5p-tv/mixer_video.c @@ -1093,7 +1093,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,