diff options
| author | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2014-07-01 12:57:43 +0200 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-11-21 19:12:25 +0900 |
| commit | a44dee07bdc5152116159cc1476e2d9eb25d66fe (patch) | |
| tree | 540cceeece38ebe5654e9bec0966fd4c3a0a1433 /include | |
| parent | cecb2c3999b03bde7efc958fa7174a9e9f56a2ad (diff) | |
| download | linux-3.10-a44dee07bdc5152116159cc1476e2d9eb25d66fe.tar.gz linux-3.10-a44dee07bdc5152116159cc1476e2d9eb25d66fe.tar.bz2 linux-3.10-a44dee07bdc5152116159cc1476e2d9eb25d66fe.zip | |
dma-buf: add poll support, v3
Thanks to Fengguang Wu for spotting a missing static cast.
v2:
- Kill unused variable need_shared.
v3:
- Clarify the BUG() in dma_buf_release some more. (Rob Clark)
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Acked-by: Sumit Semwal <sumit.semwal@linaro.org>
Acked-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Chanho Park <chanho61.park@samsung.com>
Conflicts:
drivers/dma-buf/dma-buf.c
Change-Id: I6c0d192dfd53809a16d3564e3863c1d1f0f348c7
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/dma-buf.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h index fd7def2e0ae..694e1fe1c4b 100644 --- a/include/linux/dma-buf.h +++ b/include/linux/dma-buf.h @@ -30,6 +30,8 @@ #include <linux/list.h> #include <linux/dma-mapping.h> #include <linux/fs.h> +#include <linux/fence.h> +#include <linux/wait.h> struct device; struct dma_buf; @@ -130,6 +132,16 @@ struct dma_buf { struct list_head list_node; void *priv; struct reservation_object *resv; + + /* poll support */ + wait_queue_head_t poll; + + struct dma_buf_poll_cb_t { + struct fence_cb cb; + wait_queue_head_t *poll; + + unsigned long active; + } cb_excl, cb_shared; }; /** |