Commit 57b505bb authored by Erik Gilling's avatar Erik Gilling Committed by Greg Kroah-Hartman

staging: sync: Add poll support

Support poll on sync fence

Cc: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Cc: Erik Gilling <konkers@android.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Rob Clark <robclark@gmail.com>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: dri-devel@lists.freedesktop.org
Cc: Android Kernel Team <kernel-team@android.com>
Signed-off-by: default avatarErik Gilling <konkers@android.com>
[jstultz: Add commit message]
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b1489c27
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include <linux/file.h> #include <linux/file.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/poll.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -221,12 +222,14 @@ static void sync_pt_activate(struct sync_pt *pt) ...@@ -221,12 +222,14 @@ static void sync_pt_activate(struct sync_pt *pt)
} }
static int sync_fence_release(struct inode *inode, struct file *file); static int sync_fence_release(struct inode *inode, struct file *file);
static unsigned int sync_fence_poll(struct file *file, poll_table *wait);
static long sync_fence_ioctl(struct file *file, unsigned int cmd, static long sync_fence_ioctl(struct file *file, unsigned int cmd,
unsigned long arg); unsigned long arg);
static const struct file_operations sync_fence_fops = { static const struct file_operations sync_fence_fops = {
.release = sync_fence_release, .release = sync_fence_release,
.poll = sync_fence_poll,
.unlocked_ioctl = sync_fence_ioctl, .unlocked_ioctl = sync_fence_ioctl,
}; };
...@@ -497,6 +500,20 @@ static int sync_fence_release(struct inode *inode, struct file *file) ...@@ -497,6 +500,20 @@ static int sync_fence_release(struct inode *inode, struct file *file)
return 0; return 0;
} }
static unsigned int sync_fence_poll(struct file *file, poll_table *wait)
{
struct sync_fence *fence = file->private_data;
poll_wait(file, &fence->wq, wait);
if (fence->status == 1)
return POLLIN;
else if (fence->status < 0)
return POLLERR;
else
return 0;
}
static long sync_fence_ioctl_wait(struct sync_fence *fence, unsigned long arg) static long sync_fence_ioctl_wait(struct sync_fence *fence, unsigned long arg)
{ {
__s32 value; __s32 value;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment