78e29ce591
SVN-Revision: 16459
68 lines
2.0 KiB
Diff
68 lines
2.0 KiB
Diff
From 0d1077627288e51b5604f270eae6cf9f5ccd3871 Mon Sep 17 00:00:00 2001
|
|
From: =?utf-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@android.com>
|
|
Date: Fri, 17 Oct 2008 15:20:55 -0700
|
|
Subject: [PATCH 087/134] Input: Hold wake lock while event queue is not empty.
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=utf-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Allows userspace code to process input events while
|
|
the device appears to be asleep.
|
|
|
|
Signed-off-by: Arve Hjønnevåg <arve@android.com>
|
|
---
|
|
drivers/input/evdev.c | 7 +++++++
|
|
1 files changed, 7 insertions(+), 0 deletions(-)
|
|
|
|
--- a/drivers/input/evdev.c
|
|
+++ b/drivers/input/evdev.c
|
|
@@ -19,6 +19,7 @@
|
|
#include <linux/input.h>
|
|
#include <linux/major.h>
|
|
#include <linux/device.h>
|
|
+#include <linux/wakelock.h>
|
|
#include "input-compat.h"
|
|
|
|
struct evdev {
|
|
@@ -43,6 +44,7 @@ struct evdev_client {
|
|
struct fasync_struct *fasync;
|
|
struct evdev *evdev;
|
|
struct list_head node;
|
|
+ struct wake_lock wake_lock;
|
|
};
|
|
|
|
static struct evdev *evdev_table[EVDEV_MINORS];
|
|
@@ -55,6 +57,7 @@ static void evdev_pass_event(struct evde
|
|
* Interrupts are disabled, just acquire the lock
|
|
*/
|
|
spin_lock(&client->buffer_lock);
|
|
+ wake_lock_timeout(&client->wake_lock, 5 * HZ);
|
|
client->buffer[client->head++] = *event;
|
|
client->head &= EVDEV_BUFFER_SIZE - 1;
|
|
spin_unlock(&client->buffer_lock);
|
|
@@ -233,6 +236,7 @@ static int evdev_release(struct inode *i
|
|
mutex_unlock(&evdev->mutex);
|
|
|
|
evdev_detach_client(evdev, client);
|
|
+ wake_lock_destroy(&client->wake_lock);
|
|
kfree(client);
|
|
|
|
evdev_close_device(evdev);
|
|
@@ -269,6 +273,7 @@ static int evdev_open(struct inode *inod
|
|
}
|
|
|
|
spin_lock_init(&client->buffer_lock);
|
|
+ wake_lock_init(&client->wake_lock, WAKE_LOCK_SUSPEND, "evdev");
|
|
client->evdev = evdev;
|
|
evdev_attach_client(evdev, client);
|
|
|
|
@@ -332,6 +337,8 @@ static int evdev_fetch_next_event(struct
|
|
if (have_event) {
|
|
*event = client->buffer[client->tail++];
|
|
client->tail &= EVDEV_BUFFER_SIZE - 1;
|
|
+ if (client->head == client->tail)
|
|
+ wake_unlock(&client->wake_lock);
|
|
}
|
|
|
|
spin_unlock_irq(&client->buffer_lock);
|