From patchwork Thu Aug 29 07:53:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?64yA7J246riwL1RpemVuIFBsYXRmb3JtIExhYihTUikv7IK87ISx7KCE7J6Q?= X-Patchwork-Id: 2851155 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 35FEABF546 for ; Thu, 29 Aug 2013 07:53:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4615F202F9 for ; Thu, 29 Aug 2013 07:53:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 25C4A202F0 for ; Thu, 29 Aug 2013 07:53:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754112Ab3H2Hx1 (ORCPT ); Thu, 29 Aug 2013 03:53:27 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:60073 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753448Ab3H2Hx0 (ORCPT ); Thu, 29 Aug 2013 03:53:26 -0400 Received: from epcpsbgr1.samsung.com (u141.gpu120.samsung.co.kr [203.254.230.141]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MSA005A38L0KIJ0@mailout4.samsung.com>; Thu, 29 Aug 2013 16:53:24 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.114]) by epcpsbgr1.samsung.com (EPCPMTA) with SMTP id 27.1F.30629.4FDFE125; Thu, 29 Aug 2013 16:53:24 +0900 (KST) X-AuditID: cbfee68d-b7fe86d0000077a5-21-521efdf4bc4a Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 76.F5.09055.3FDFE125; Thu, 29 Aug 2013 16:53:24 +0900 (KST) Received: from daeinki-desktop.10.32.193.11 ([10.252.75.62]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MSA00FO38KY2Q00@mmp2.samsung.com>; Thu, 29 Aug 2013 16:53:23 +0900 (KST) From: Inki Dae To: dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, linaro-kernel@lists.linaro.org Cc: maarten.lankhorst@canonical.com, sumit.semwal@linaro.org, kyungmin.park@samsung.com, myungjoo.ham@samsung.com, Inki Dae Subject: [PATCH v2 2/2] dma-buf: Add user interfaces for dmabuf sync support Date: Thu, 29 Aug 2013 16:53:21 +0900 Message-id: <1377762801-14057-3-git-send-email-inki.dae@samsung.com> X-Mailer: git-send-email 1.7.5.4 In-reply-to: <1377762801-14057-1-git-send-email-inki.dae@samsung.com> References: <1377762801-14057-1-git-send-email-inki.dae@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupnkeLIzCtJLcpLzFFi42JZI2JSpPvlr1yQwYaXvBZXvr5ns5h0fwKL xdmmN+wW7w89Y7bY9Pgaq8WJvg+sFj0btrJaPH16gc3iduMKNotTdz+zO3B5zGroZfO4c20P m8f97uNMHpuX1Hvc/veY2aNvyypGj8+b5ALYo7hsUlJzMstSi/TtErgy7i3/zljwUKbi2mn+ BsYPYl2MnBwSAiYSDz52skLYYhIX7q1nA7GFBJYySlw8Kg1T8+HIDKAaLqD4dEaJow/Os0M4 3UwSu2b2M4FUsQmoSkxccZ8NJCEisJxR4uPpt2BVzALTGCXeNm1gAakSFvCROPnsJ9g+FqCO ua8Wg9m8Ai4St3f2MEPsU5D4dWQVWJxTwFWi7dt+qJtcJFau6mQGGSohcIhd4se+H+wQgwQk vk0+BLSAAyghK7HpANQcSYmDK26wTGAUXsDIsIpRNLUguaA4Kb3IUK84Mbe4NC9dLzk/dxMj MDJO/3vWu4Px9gHrQ4zJQOMmMkuJJucDIyuvJN7Q2MzIwtTE1NjI3NKMNGElcV61FutAIYH0 xJLU7NTUgtSi+KLSnNTiQ4xMHJxSDYyXmc+pqhkpPdB50Ho0So43WSIq5ypHxWPdKYyHS9b2 7Kl9sr7BKkE0XJlLsdntYvdWphbRDxevmU36zMS29d+2C7tze5ZWrF9x9Ppao9+6P65HeF/d ksrex/7+dpDihX6lq963OTLMLRMTTyVJHO1/pjL116uGp3Km2RNuzrz/qEF6u3t6vI8SS3FG oqEWc1FxIgC4M0EqogIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrLIsWRmVeSWpSXmKPExsVy+t9jQd0vf+WCDO5sYLW48vU9m8Wk+xNY LM42vWG3eH/oGbPFpsfXWC1O9H1gtejZsJXV4unTC2wWtxtXsFmcuvuZ3YHLY1ZDL5vHnWt7 2Dzudx9n8ti8pN7j9r/HzB59W1YxenzeJBfAHtXAaJORmpiSWqSQmpecn5KZl26r5B0c7xxv amZgqGtoaWGupJCXmJtqq+TiE6DrlpkDdJ+SQlliTilQKCCxuFhJ3w7ThNAQN10LmMYIXd+Q ILgeIwM0kLCGMePe8u+MBQ9lKq6d5m9g/CDWxcjJISFgIvHhyAxWCFtM4sK99WxdjFwcQgLT GSWOPjjPDuF0M0nsmtnPBFLFJqAqMXHFfbAqEYHljBIfT78Fq2IWmMYo8bZpAwtIlbCAj8TJ Zz/B5rIAdcx9tRjM5hVwkbi9s4cZYp+CxK8jq8DinAKuEm3f9rOB2EJANStXdTJPYORdwMiw ilE0tSC5oDgpPddQrzgxt7g0L10vOT93EyM48p5J7WBc2WBxiFGAg1GJhzfit2yQEGtiWXFl 7iFGCQ5mJRHeL2/kgoR4UxIrq1KL8uOLSnNSiw8xJgNdNZFZSjQ5H5gU8kriDY1NzIwsjcwN LYyMzUkTVhLnPdBqHSgkkJ5YkpqdmlqQWgSzhYmDU6qBUU2vyGkC/0a7z3umJ+zaZfM+4Ry7 XvcK8esz2DLvaSlMmhb22+Gie031+l/V1n7Xb3rcKVC88v1yiaPFznesG/ZbKG9nPht4P3Lx +/PfTj1xVjwdE3pol27B8hC9Vr9TDumrXr44pXD/UlVQp/mM4pVG9/3msqcXHTh1+PDfo97b krw47z/h/K3EUpyRaKjFXFScCAAQ03ngAAMAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-9.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds lock and poll callbacks to dma buf file operations, and these callbacks will be called by fcntl and select system calls. fcntl and select system calls can be used to wait for the completion of DMA or CPU access to a shared dmabuf. The difference of them is fcntl system call takes a lock after the completion but select system call doesn't. So in case of fcntl system call, it's useful when a task wants to access a shared dmabuf without any broken. On the other hand, it's useful when a task wants to just wait for the completion. Changelog v2: - Add select system call support. . The purpose of this feature is to wait for the completion of DMA or CPU access to a dmabuf without that caller locks the dmabuf again after the completion. That is useful when caller wants to be aware of the completion of DMA access to the dmabuf, and the caller doesn't use intefaces for the DMA device driver. Signed-off-by: Inki Dae Signed-off-by: Kyungmin Park --- drivers/base/dma-buf.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 81 insertions(+), 0 deletions(-) diff --git a/drivers/base/dma-buf.c b/drivers/base/dma-buf.c index cc42a38..f961907 100644 --- a/drivers/base/dma-buf.c +++ b/drivers/base/dma-buf.c @@ -30,6 +30,7 @@ #include #include #include +#include #include static inline int is_dma_buf_file(struct file *); @@ -81,9 +82,89 @@ static int dma_buf_mmap_internal(struct file *file, struct vm_area_struct *vma) return dmabuf->ops->mmap(dmabuf, vma); } +static unsigned int dma_buf_poll(struct file *filp, + struct poll_table_struct *poll) +{ + struct dma_buf *dmabuf; + struct dmabuf_sync_reservation *robj; + int ret = 0; + + if (!is_dma_buf_file(filp)) + return POLLERR; + + dmabuf = filp->private_data; + if (!dmabuf || !dmabuf->sync) + return POLLERR; + + robj = dmabuf->sync; + + mutex_lock(&robj->lock); + + robj->polled = true; + + /* + * CPU or DMA access to this buffer has been completed, and + * the blocked task has been waked up. Return poll event + * so that the task can get out of select(). + */ + if (robj->poll_event) { + robj->poll_event = false; + mutex_unlock(&robj->lock); + return POLLIN | POLLOUT; + } + + /* + * There is no anyone accessing this buffer so just return. + */ + if (!robj->locked) { + mutex_unlock(&robj->lock); + return POLLIN | POLLOUT; + } + + poll_wait(filp, &robj->poll_wait, poll); + + mutex_unlock(&robj->lock); + + return ret; +} + +static int dma_buf_lock(struct file *file, int cmd, struct file_lock *fl) +{ + struct dma_buf *dmabuf; + unsigned int type; + bool wait = false; + + if (!is_dma_buf_file(file)) + return -EINVAL; + + dmabuf = file->private_data; + + if ((fl->fl_type & F_UNLCK) == F_UNLCK) { + dmabuf_sync_single_unlock(dmabuf); + return 0; + } + + /* convert flock type to dmabuf sync type. */ + if ((fl->fl_type & F_WRLCK) == F_WRLCK) + type = DMA_BUF_ACCESS_W; + else if ((fl->fl_type & F_RDLCK) == F_RDLCK) + type = DMA_BUF_ACCESS_R; + else + return -EINVAL; + + if (fl->fl_flags & FL_SLEEP) + wait = true; + + /* TODO. the locking to certain region should also be considered. */ + + return dmabuf_sync_single_lock(dmabuf, type, wait); +} + static const struct file_operations dma_buf_fops = { .release = dma_buf_release, .mmap = dma_buf_mmap_internal, + .poll = dma_buf_poll, + .lock = dma_buf_lock, }; /*