summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Gilling <konkers@android.com>2012-03-19 17:28:32 -0700
committerErik Gilling <konkers@android.com>2012-05-16 13:27:24 -0700
commita1eeacaf7a96729d6bedae031af5565b7a4e9487 (patch)
treef732d5942e88b389d6eb58e8aca17f767764d91b
parent484101e5a816cb1e9022805d1714445c473e5b63 (diff)
sync: add poll support
Change-Id: I294e481bba92658e6dd26f157ddbf0e9ff4ce8a5 Signed-off-by: Erik Gilling <konkers@android.com>
-rw-r--r--drivers/base/sync.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/drivers/base/sync.c b/drivers/base/sync.c
index 80749ec68b8..cc40e4c9e65 100644
--- a/drivers/base/sync.c
+++ b/drivers/base/sync.c
@@ -18,6 +18,7 @@
#include <linux/file.h>
#include <linux/fs.h>
#include <linux/kernel.h>
+#include <linux/poll.h>
#include <linux/sched.h>
#include <linux/seq_file.h>
#include <linux/slab.h>
@@ -221,12 +222,14 @@ out:
}
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,
unsigned long arg);
static const struct file_operations sync_fence_fops = {
.release = sync_fence_release,
+ .poll = sync_fence_poll,
.unlocked_ioctl = sync_fence_ioctl,
};
@@ -497,6 +500,20 @@ static int sync_fence_release(struct inode *inode, struct file *file)
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)
{
__u32 value;