Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[firefly-linux-kernel-4.4.55.git] / include / linux / dma-buf.h

diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h
index fd7def2e0ae211151ed97b3294aacc8bc453b455..694e1fe1c4b4fa8996cab8dcf9fbfa74198f1aed 100644 (file)
--- 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;
 };
 
 /**