Merge remote branch 'airlied/drm-next' into drm-intel-next

1 files changed, 26 insertions, 0 deletions

diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index c8e64bbadbcf..b0b36838ab11 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -426,6 +426,14 @@ struct drm_buf_entry {
         struct drm_freelist freelist;
 };
 
+/* Event queued up for userspace to read */
+struct drm_pending_event {
+        struct drm_event *event;
+        struct list_head link;
+        struct drm_file *file_priv;
+        void (*destroy)(struct drm_pending_event *event);
+};
+
 /** File private data */
 struct drm_file {
         int authenticated;
@@ -449,6 +457,10 @@ struct drm_file {
         struct drm_master *master; /* master this node is currently associated with
                                       N.B. not always minor->master */
         struct list_head fbs;
+
+        wait_queue_head_t event_wait;
+        struct list_head event_list;
+        int event_space;
 };
 
 /** Wait queue */
@@ -900,6 +912,12 @@ struct drm_minor {
         struct drm_mode_group mode_group;
 };
 
+struct drm_pending_vblank_event {
+        struct drm_pending_event base;
+        int pipe;
+        struct drm_event_vblank event;
+};
+
 /**
  * DRM device structure. This structure represent a complete card that
  * may contain multiple heads.
@@ -999,6 +1017,12 @@ struct drm_device {
 
         u32 max_vblank_count;           /**< size of vblank counter register */
 
+        /**
+         * List of events
+         */
+        struct list_head vblank_event_list;
+        spinlock_t event_lock;
+
         /*@} */
         cycles_t ctx_start;
         cycles_t lck_start;
@@ -1135,6 +1159,8 @@ extern int drm_lastclose(struct drm_device *dev);
 extern int drm_open(struct inode *inode, struct file *filp);
 extern int drm_stub_open(struct inode *inode, struct file *filp);
 extern int drm_fasync(int fd, struct file *filp, int on);
+extern ssize_t drm_read(struct file *filp, char __user *buffer,
+                        size_t count, loff_t *offset);
 extern int drm_release(struct inode *inode, struct file *filp);
 
                                 /* Mapping support (drm_vm.h) */