PM: earlysuspend: Add console switch when user requested sleep state changes.

Signed-off-by: Arve Hjønnevåg <arve@android.com>

diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index b0a195b9e78cadab67f26a5004869f1aadb5a607..625d65318ed357fa3ae5b4aa8c0b00dc875c60e6 100644 (file)
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -59,6 +59,23 @@ config EARLYSUSPEND
          Call early suspend handlers when the user requested sleep state
          changes.
 
+choice
+       prompt "User-space screen access"
+       default CONSOLE_EARLYSUSPEND
+       depends on HAS_EARLYSUSPEND
+
+       config NO_USER_SPACE_SCREEN_ACCESS_CONTROL
+               bool "None"
+
+       config CONSOLE_EARLYSUSPEND
+               bool "Console switch on early-suspend"
+               depends on HAS_EARLYSUSPEND && VT
+               ---help---
+                 Register early suspend handler to perform a console switch to
+                 when user-space should stop drawing to the screen and a switch
+                 back when it should resume.
+endchoice
+
 config HIBERNATE_CALLBACKS
        bool
 

diff --git a/kernel/power/Makefile b/kernel/power/Makefile
index 44a3db6f5ee6743d3105048f982e5b6ef9431048..0d1c5e4fda19ef176a6e99b85345189e6c5b037d 100644 (file)
--- a/kernel/power/Makefile
+++ b/kernel/power/Makefile
@@ -11,5 +11,6 @@ obj-$(CONFIG_HIBERNATION)     += hibernate.o snapshot.o swap.o user.o \
 obj-$(CONFIG_WAKELOCK)         += wakelock.o
 obj-$(CONFIG_USER_WAKELOCK)    += userwakelock.o
 obj-$(CONFIG_EARLYSUSPEND)     += earlysuspend.o
+obj-$(CONFIG_CONSOLE_EARLYSUSPEND)     += consoleearlysuspend.o
 
 obj-$(CONFIG_MAGIC_SYSRQ)      += poweroff.o

diff --git a/kernel/power/consoleearlysuspend.c b/kernel/power/consoleearlysuspend.c
new file mode 100644 (file)
index 0000000..a8befb4
--- /dev/null
+++ b/kernel/power/consoleearlysuspend.c
@@ -0,0 +1,78 @@
+/* kernel/power/consoleearlysuspend.c
+ *
+ * Copyright (C) 2005-2008 Google, Inc.
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <linux/console.h>
+#include <linux/earlysuspend.h>
+#include <linux/kbd_kern.h>
+#include <linux/module.h>
+#include <linux/vt_kern.h>
+#include <linux/wait.h>
+
+#define EARLY_SUSPEND_CONSOLE  (MAX_NR_CONSOLES-1)
+
+static int orig_fgconsole;
+static void console_early_suspend(struct early_suspend *h)
+{
+       acquire_console_sem();
+       orig_fgconsole = fg_console;
+       if (vc_allocate(EARLY_SUSPEND_CONSOLE))
+               goto err;
+       if (set_console(EARLY_SUSPEND_CONSOLE))
+               goto err;
+       release_console_sem();
+
+       if (vt_waitactive(EARLY_SUSPEND_CONSOLE))
+               pr_warning("console_early_suspend: Can't switch VCs.\n");
+       return;
+err:
+       pr_warning("console_early_suspend: Can't set console\n");
+       release_console_sem();
+}
+
+static void console_late_resume(struct early_suspend *h)
+{
+       int ret;
+       acquire_console_sem();
+       ret = set_console(orig_fgconsole);
+       release_console_sem();
+       if (ret) {
+               pr_warning("console_late_resume: Can't set console.\n");
+               return;
+       }
+
+       if (vt_waitactive(orig_fgconsole))
+               pr_warning("console_late_resume: Can't switch VCs.\n");
+}
+
+static struct early_suspend console_early_suspend_desc = {
+       .level = EARLY_SUSPEND_LEVEL_STOP_DRAWING,
+       .suspend = console_early_suspend,
+       .resume = console_late_resume,
+};
+
+static int __init console_early_suspend_init(void)
+{
+       register_early_suspend(&console_early_suspend_desc);
+       return 0;
+}
+
+static void  __exit console_early_suspend_exit(void)
+{
+       unregister_early_suspend(&console_early_suspend_desc);
+}
+
+module_init(console_early_suspend_init);
+module_exit(console_early_suspend_exit);
+