Commit 8d233558 authored by Alan Cox's avatar Alan Cox Committed by Live-CD User

vt: remove power stuff from kernel/power

In the past someone gratuitiously borrowed chunks of kernel internal vt
code and dumped them in kernel/power. They have all sorts of deep relations
with the vt code so put them in the vt tree instead
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8b92e87d
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include <linux/tty.h> #include <linux/tty.h>
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h>
#include <linux/kd.h> #include <linux/kd.h>
#include <linux/vt.h> #include <linux/vt.h>
#include <linux/string.h> #include <linux/string.h>
...@@ -1483,3 +1484,58 @@ void change_console(struct vc_data *new_vc) ...@@ -1483,3 +1484,58 @@ void change_console(struct vc_data *new_vc)
complete_change_console(new_vc); complete_change_console(new_vc);
} }
/* Perform a kernel triggered VT switch for suspend/resume */
static int disable_vt_switch;
int vt_move_to_console(unsigned int vt, int alloc)
{
int prev;
acquire_console_sem();
/* Graphics mode - up to X */
if (disable_vt_switch) {
release_console_sem();
return 0;
}
prev = fg_console;
if (alloc && vc_allocate(vt)) {
/* we can't have a free VC for now. Too bad,
* we don't want to mess the screen for now. */
release_console_sem();
return -ENOSPC;
}
if (set_console(vt)) {
/*
* We're unable to switch to the SUSPEND_CONSOLE.
* Let the calling function know so it can decide
* what to do.
*/
release_console_sem();
return -EIO;
}
release_console_sem();
if (vt_waitactive(vt)) {
pr_debug("Suspend: Can't switch VCs.");
return -EINTR;
}
return prev;
}
/*
* Normally during a suspend, we allocate a new console and switch to it.
* When we resume, we switch back to the original console. This switch
* can be slow, so on systems where the framebuffer can handle restoration
* of video registers anyways, there's little point in doing the console
* switch. This function allows you to disable it by passing it '0'.
*/
void pm_set_vt_switch(int do_switch)
{
acquire_console_sem();
disable_vt_switch = !do_switch;
release_console_sem();
}
EXPORT_SYMBOL(pm_set_vt_switch);
...@@ -117,4 +117,5 @@ struct vt_spawn_console { ...@@ -117,4 +117,5 @@ struct vt_spawn_console {
}; };
extern struct vt_spawn_console vt_spawn_con; extern struct vt_spawn_console vt_spawn_con;
extern int vt_move_to_console(unsigned int vt, int alloc);
#endif /* _VT_KERN_H */ #endif /* _VT_KERN_H */
...@@ -14,56 +14,13 @@ ...@@ -14,56 +14,13 @@
#define SUSPEND_CONSOLE (MAX_NR_CONSOLES-1) #define SUSPEND_CONSOLE (MAX_NR_CONSOLES-1)
static int orig_fgconsole, orig_kmsg; static int orig_fgconsole, orig_kmsg;
static int disable_vt_switch;
/*
* Normally during a suspend, we allocate a new console and switch to it.
* When we resume, we switch back to the original console. This switch
* can be slow, so on systems where the framebuffer can handle restoration
* of video registers anyways, there's little point in doing the console
* switch. This function allows you to disable it by passing it '0'.
*/
void pm_set_vt_switch(int do_switch)
{
acquire_console_sem();
disable_vt_switch = !do_switch;
release_console_sem();
}
EXPORT_SYMBOL(pm_set_vt_switch);
int pm_prepare_console(void) int pm_prepare_console(void)
{ {
acquire_console_sem(); orig_fgconsole = vt_move_to_console(SUSPEND_CONSOLE, 1);
if (orig_fgconsole < 0)
if (disable_vt_switch) {
release_console_sem();
return 0;
}
orig_fgconsole = fg_console;
if (vc_allocate(SUSPEND_CONSOLE)) {
/* we can't have a free VC for now. Too bad,
* we don't want to mess the screen for now. */
release_console_sem();
return 1;
}
if (set_console(SUSPEND_CONSOLE)) {
/*
* We're unable to switch to the SUSPEND_CONSOLE.
* Let the calling function know so it can decide
* what to do.
*/
release_console_sem();
return 1; return 1;
}
release_console_sem();
if (vt_waitactive(SUSPEND_CONSOLE)) {
pr_debug("Suspend: Can't switch VCs.");
return 1;
}
orig_kmsg = kmsg_redirect; orig_kmsg = kmsg_redirect;
kmsg_redirect = SUSPEND_CONSOLE; kmsg_redirect = SUSPEND_CONSOLE;
return 0; return 0;
...@@ -71,19 +28,9 @@ int pm_prepare_console(void) ...@@ -71,19 +28,9 @@ int pm_prepare_console(void)
void pm_restore_console(void) void pm_restore_console(void)
{ {
acquire_console_sem(); if (orig_fgconsole >= 0) {
if (disable_vt_switch) { vt_move_to_console(orig_fgconsole, 0);
release_console_sem();
return;
}
set_console(orig_fgconsole);
release_console_sem();
if (vt_waitactive(orig_fgconsole)) {
pr_debug("Resume: Can't switch VCs.");
return;
}
kmsg_redirect = orig_kmsg; kmsg_redirect = orig_kmsg;
}
} }
#endif #endif
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