From patchwork Tue Aug 14 15:34:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Stanislawski X-Patchwork-Id: 10738 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 779A423F34 for ; Tue, 14 Aug 2012 15:36:32 +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 31FF6A18A2E for ; Tue, 14 Aug 2012 15:36:32 +0000 (UTC) Received: by ggmi2 with SMTP id i2so621577ggm.11 for ; Tue, 14 Aug 2012 08:36:31 -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=BiRY4OdU9mc88M5NiwOnCnm2V4/YQo0QD1Gm82OQWJA=; b=hlNtR+7ho5Wz38+uTcRa5ZHklfWUc+bh7lJ2u6QwQszzOKcBe20z31AQA2I5FEP9Ma xTwviT+7a20Qwr29YIaftdGCXJxiz0+1Mpec6BW+ntIGdMRd4iKt2gVff1te5POqAANI qquHW9zzDC0S8vEZSz6Rkgy7A69QcavdFxn+X7hf6By5Fph9biFvmFkhzAhrwLU+mYbT vvWaGKnzcMj+HynyT+Ml6SQ1yq+uAzDMcloaLcc+1UJJNEc0QGsvuXW8bV6nWutBhV4E IcZ+CeYhBK3hehIUdLQTUmvjEDskYFtp2LikUJ0MDiZtkoJMX+ghRrbnVTFgTkF1OgFp 7cCg== Received: by 10.50.6.229 with SMTP id e5mr12625436iga.9.1344958591378; Tue, 14 Aug 2012 08:36:31 -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 ew8csp20597igc; Tue, 14 Aug 2012 08:36:30 -0700 (PDT) Received: by 10.180.92.9 with SMTP id ci9mr28813251wib.22.1344958589459; Tue, 14 Aug 2012 08:36:29 -0700 (PDT) Received: from mombin.canonical.com (mombin.canonical.com. [91.189.95.16]) by mx.google.com with ESMTP id r9si26850367wic.46.2012.08.14.08.36.28; Tue, 14 Aug 2012 08:36:29 -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 1T1JAQ-00089i-PI; Tue, 14 Aug 2012 15:36:26 +0000 Received: from mailout1.samsung.com ([203.254.224.24]) by mombin.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1T1JAO-00089R-OT for linaro-mm-sig@lists.linaro.org; Tue, 14 Aug 2012 15:36:25 +0000 Received: from epcpsbgm2.samsung.com (mailout1.samsung.com [203.254.224.24]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0M8R0013N4ONVXG0@mailout1.samsung.com> for linaro-mm-sig@lists.linaro.org; Wed, 15 Aug 2012 00:36:23 +0900 (KST) X-AuditID: cbfee61b-b7faf6d00000476a-fd-502a7077690a Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id AB.D9.18282.7707A205; Wed, 15 Aug 2012 00:36:23 +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:36:23 +0900 (KST) From: Tomasz Stanislawski To: linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org Date: Tue, 14 Aug 2012 17:34:39 +0200 Message-id: <1344958496-9373-10-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+t9jAd3yAq0Agzm/5C2+XHnI5MDocfvf Y+YAxigum5TUnMyy1CJ9uwSujPOH5rIVnBSreDSjibGB8ZBQFyMnh4SAicSvKf/ZIGwxiQv3 1gPZXBxCAosYJT61NbFAOGuZJBbNusgMUsUG1HFsyWdGEFtEwEHi9N1ZzCBFzAKHmCX2975m B0kIC/hKLD/1gQXEZhFQldjUsosVxOYV8JDo/7WBEWKdvMTT+31gqzmB4i83dQPFOYC2uUss /Ok/gZF3ASPDKkbR1ILkguKk9FwjveLE3OLSvHS95PzcTYxgrz+T3sG4qsHiEKMAB6MSD29h omaAEGtiWXFl7iFGCQ5mJRHeoiCtACHelMTKqtSi/Pii0pzU4kOM0hwsSuK8Jt5f/YUE0hNL UrNTUwtSi2CyTBycUg2M8vVX5d48K363mllv2QEbZ9W0VQbCLJ/sf3+IWDJ9/mMm7o1Tnjxl ffJ0Yqp88xSz9+ZH7HKl+Nk35ka0n1+qfjg6U+VG0iTmTsXPnuvikjevLeNV7XlglH3g3H8v 3RVae73XXlY+zbjjPcOWG2tKXz+O8di1RZZtUsSpL57pTLrbfx2+0+qXp8RSnJFoqMVcVJwI AP/tzNf2AQAA 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 09/26] v4l: vb2: add prepare/finish callbacks to allocators 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: ALoCoQmvWK0MS7vjZdgwDp/KXrJl95oxBTv88vKOD/XdOfMNdSSS6SRdrmH6gB9hArnOPKsPdxgF From: Marek Szyprowski This patch adds support for prepare/finish callbacks in VB2 allocators. These callback are used for buffer flushing. Signed-off-by: Marek Szyprowski Acked-by: Laurent Pinchart --- drivers/media/video/videobuf2-core.c | 11 +++++++++++ include/media/videobuf2-core.h | 7 +++++++ 2 files changed, 18 insertions(+) diff --git a/drivers/media/video/videobuf2-core.c b/drivers/media/video/videobuf2-core.c index a5d5081..aed21e4 100644 --- a/drivers/media/video/videobuf2-core.c +++ b/drivers/media/video/videobuf2-core.c @@ -850,6 +850,7 @@ void vb2_buffer_done(struct vb2_buffer *vb, enum vb2_buffer_state state) { struct vb2_queue *q = vb->vb2_queue; unsigned long flags; + unsigned int plane; if (vb->state != VB2_BUF_STATE_ACTIVE) return; @@ -860,6 +861,10 @@ void vb2_buffer_done(struct vb2_buffer *vb, enum vb2_buffer_state state) dprintk(4, "Done processing on buffer %d, state: %d\n", vb->v4l2_buf.index, vb->state); + /* sync buffers */ + for (plane = 0; plane < vb->num_planes; ++plane) + call_memop(q, finish, vb->planes[plane].mem_priv); + /* Add the buffer to the done buffers list */ spin_lock_irqsave(&q->done_lock, flags); vb->state = state; @@ -1138,9 +1143,15 @@ err: static void __enqueue_in_driver(struct vb2_buffer *vb) { struct vb2_queue *q = vb->vb2_queue; + unsigned int plane; vb->state = VB2_BUF_STATE_ACTIVE; atomic_inc(&q->queued_count); + + /* sync buffers */ + for (plane = 0; plane < vb->num_planes; ++plane) + call_memop(q, prepare, vb->planes[plane].mem_priv); + q->ops->buf_queue(vb); } diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h index 84f11f2..c306fec 100644 --- a/include/media/videobuf2-core.h +++ b/include/media/videobuf2-core.h @@ -56,6 +56,10 @@ struct vb2_fileio_data; * dmabuf * @unmap_dmabuf: releases access control to the dmabuf - allocator is notified * that this driver is done using the dmabuf for now + * @prepare: called everytime the buffer is passed from userspace to the + * driver, usefull for cache synchronisation, optional + * @finish: called everytime the buffer is passed back from the driver + * to the userspace, also optional * @vaddr: return a kernel virtual address to a given memory buffer * associated with the passed private structure or NULL if no * such mapping exists @@ -82,6 +86,9 @@ struct vb2_mem_ops { unsigned long size, int write); void (*put_userptr)(void *buf_priv); + void (*prepare)(void *buf_priv); + void (*finish)(void *buf_priv); + void *(*attach_dmabuf)(void *alloc_ctx, struct dma_buf *dbuf, unsigned long size, int write); void (*detach_dmabuf)(void *buf_priv);