Message ID | 1349880405-26049-14-git-send-email-t.stanislaws@samsung.com |
---|---|
State | Accepted |
Commit | a626f0ac9dec1d28d16f62eed6f5ea0879ddb4e0 |
Headers | show
Return-Path: <patch+caf_=linaro-patchwork=canonical.com@linaro.org> 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 EAAB223EFB for <patchwork@peony.canonical.com>; Wed, 10 Oct 2012 14:56:47 +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 58B5AA18444 for <linaro-patchwork@canonical.com>; Wed, 10 Oct 2012 14:56:47 +0000 (UTC) Received: by mail-ia0-f180.google.com with SMTP id f6so420938iag.11 for <linaro-patchwork@canonical.com>; Wed, 10 Oct 2012 07:56:46 -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=n9vKcpLltGxw72JeEs2d7d1kTFEgvNb3ZEOZr9nzDDE=; b=RWQNvvcHl3LcLVt8+FqxeL3/5k25YnHEjw+ZhjyCndc14/URPJHrh5ucKGlirOSXSe nR7MD2QWBLsUHM7NawUTJcdZBHSRJ3VKU65lwrhkATgGgxJO8g8ak42/P3qksxuVAE/d lXaPYykRzix60tje/mxykRxkmqlDuAOrTB68RGho2EwyG2AX7b+12ZF0k3InQiZFfimG 2c6UL7gqJwOpgiqln9aQ7lUDWgJ6mjW3GiMyU68Oqqb5C8F1uyVgumDl1YpWjxYw6acJ cnxK7rwR4iFBWMrxuY0w+c8G+Pb/tXN9gkMTrhG1XfkM7YzqXkHybRku5/OuIeF6O6/5 CrQA== Received: by 10.50.159.194 with SMTP id xe2mr5431456igb.62.1349881006806; Wed, 10 Oct 2012 07:56:46 -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 n20csp236625igt; Wed, 10 Oct 2012 07:56:46 -0700 (PDT) Received: by 10.204.150.211 with SMTP id z19mr7337365bkv.60.1349881005286; Wed, 10 Oct 2012 07:56:45 -0700 (PDT) Received: from mombin.canonical.com (mombin.canonical.com. [91.189.95.16]) by mx.google.com with ESMTP id fk7si2841295bkc.68.2012.10.10.07.56.43; Wed, 10 Oct 2012 07:56: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 <linaro-mm-sig-bounces@lists.linaro.org>) id 1TLxiE-0001qw-L6; Wed, 10 Oct 2012 14:56:42 +0000 Received: from mailout1.samsung.com ([203.254.224.24]) by mombin.canonical.com with esmtp (Exim 4.71) (envelope-from <t.stanislaws@samsung.com>) id 1TLxiD-0001qT-9p for linaro-mm-sig@lists.linaro.org; Wed, 10 Oct 2012 14:56:41 +0000 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MBO00LJZMU6OO30@mailout1.samsung.com> for linaro-mm-sig@lists.linaro.org; Wed, 10 Oct 2012 23:56:34 +0900 (KST) X-AuditID: cbfee61b-b7f2b6d000000f14-ae-50758ca20c2b Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 86.CB.03860.2AC85705; Wed, 10 Oct 2012 23:56:34 +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:34 +0900 (KST) From: Tomasz Stanislawski <t.stanislaws@samsung.com> To: linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org Date: Wed, 10 Oct 2012 16:46:32 +0200 Message-id: <1349880405-26049-14-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+NgFnrEJMWRmVeSWpSXmKPExsVy+t9jAd1FPaUBBoenWVt8ufKQyYHR4/a/ x8wBjFFcNimpOZllqUX6dglcGVuW/Gcv2M5e8aBFtoFxCVsXIyeHhICJRO/VY4wQtpjEhXvr geJcHEICixgllqxewwjhrGWS6LhymBmkig2o49iSz2AdIgIOEqfvzmIGKWIWWMMs8WLlDbCx wgKOElMunmHqYuTgYBFQlbi21AMkzCvgKXF+8QqozfIST+/3gdmcQPEL86aDzRcS8JD4v34z 0wRG3gWMDKsYRVMLkguKk9JzjfSKE3OLS/PS9ZLzczcxgn3+THoH46oGi0OMAhyMSjy8FRkl AUKsiWXFlbmHGCU4mJVEeE19SgOEeFMSK6tSi/Lji0pzUosPMUpzsCiJ8zZ7pAQICaQnlqRm p6YWpBbBZJk4OKUaGH0cXJ75z79zw/1HjEvn7HvHy4JbvJve3N/9fv7sf5fXcjU/TErcEuf2 /Yv2TaOUB3e3OPL5maaVqIVod/m9LfWYzed4TiHKpHie8ZNzXM+DrNsmOlxLm/Hj9NV7/d9k FVjdn/Xt3FtV8vKJQMN715ClG1m32HSEBZ8I79gy8dDV+lbFRu6ftUosxRmJhlrMRcWJAAZS Akn1AQAA 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 13/26] v4l: vivi: 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." <linaro-mm-sig.lists.linaro.org> List-Unsubscribe: <http://lists.linaro.org/mailman/options/linaro-mm-sig>, <mailto:linaro-mm-sig-request@lists.linaro.org?subject=unsubscribe> List-Archive: <http://lists.linaro.org/pipermail/linaro-mm-sig> List-Post: <mailto:linaro-mm-sig@lists.linaro.org> List-Help: <mailto:linaro-mm-sig-request@lists.linaro.org?subject=help> List-Subscribe: <http://lists.linaro.org/mailman/listinfo/linaro-mm-sig>, <mailto:linaro-mm-sig-request@lists.linaro.org?subject=subscribe> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: linaro-mm-sig-bounces@lists.linaro.org Errors-To: linaro-mm-sig-bounces@lists.linaro.org X-Gm-Message-State: ALoCoQkUbmd1iWH1jSQVFwukbS8/ujlCP5tRJ+E27h2HUy03sxnoai4CH+OKL9ogAAS37PZXUeoK |
diff --git a/drivers/media/platform/vivi.c b/drivers/media/platform/vivi.c index b366b05..9e077bb 100644 --- a/drivers/media/platform/vivi.c +++ b/drivers/media/platform/vivi.c @@ -1308,7 +1308,7 @@ static int __init vivi_create_instance(int inst) /* initialize queue */ q = &dev->vb_vidq; q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - q->io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ; + q->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF | VB2_READ; q->drv_priv = dev; q->buf_struct_size = sizeof(struct vivi_buffer); q->ops = &vivi_video_qops;