aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndres Salomon <dilinger@queued.net>2008-04-28 05:15:28 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-28 11:58:39 -0400
commit564820d42aaa55e6ce60a59c0f60832e1330c58b (patch)
tree14312ba428c32d36e023d437b3d02ed86b0add1f
parentc805df3d6205573fa7a8ef2334b1c8d67381dc8b (diff)
lxfb: disable suspend VT switch by default
By default disable VT switch, but allow it to be overridden via the 'vt_switch' module arg. Signed-off-by: Andres Salomon <dilinger@debian.org> Cc: "Antonino A. Daplas" <adaplas@pol.net> Cc: Jordan Crouse <jordan.crouse@amd.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--Documentation/fb/lxfb.txt2
-rw-r--r--drivers/video/geode/lxfb_core.c7
2 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/fb/lxfb.txt b/Documentation/fb/lxfb.txt
index 80656078d4d9..38b3ca6f6ca7 100644
--- a/Documentation/fb/lxfb.txt
+++ b/Documentation/fb/lxfb.txt
@@ -45,6 +45,8 @@ Accepted options:
45mode_option - specify the video mode. Of the form 45mode_option - specify the video mode. Of the form
46 <x>x<y>[-<bpp>][@<refresh>] 46 <x>x<y>[-<bpp>][@<refresh>]
47vram - size of video ram (normally auto-detected) 47vram - size of video ram (normally auto-detected)
48vt_switch - enable vt switching during suspend/resume. The vt
49 switch is slow, but harmless.
48 50
49-- 51--
50Andres Salomon <dilinger@debian.org> 52Andres Salomon <dilinger@debian.org>
diff --git a/drivers/video/geode/lxfb_core.c b/drivers/video/geode/lxfb_core.c
index 1da944bdb11a..15150ed41cec 100644
--- a/drivers/video/geode/lxfb_core.c
+++ b/drivers/video/geode/lxfb_core.c
@@ -17,6 +17,7 @@
17#include <linux/console.h> 17#include <linux/console.h>
18#include <linux/mm.h> 18#include <linux/mm.h>
19#include <linux/slab.h> 19#include <linux/slab.h>
20#include <linux/suspend.h>
20#include <linux/delay.h> 21#include <linux/delay.h>
21#include <linux/fb.h> 22#include <linux/fb.h>
22#include <linux/init.h> 23#include <linux/init.h>
@@ -28,6 +29,7 @@
28static char *mode_option; 29static char *mode_option;
29static int noclear, nopanel, nocrt; 30static int noclear, nopanel, nocrt;
30static int vram; 31static int vram;
32static int vt_switch;
31 33
32/* Most of these modes are sorted in ascending order, but 34/* Most of these modes are sorted in ascending order, but
33 * since the first entry in this table is the "default" mode, 35 * since the first entry in this table is the "default" mode,
@@ -523,6 +525,8 @@ static int __init lxfb_probe(struct pci_dev *pdev,
523 lxfb_check_var(&info->var, info); 525 lxfb_check_var(&info->var, info);
524 lxfb_set_par(info); 526 lxfb_set_par(info);
525 527
528 pm_set_vt_switch(vt_switch);
529
526 if (register_framebuffer(info) < 0) { 530 if (register_framebuffer(info) < 0) {
527 ret = -EINVAL; 531 ret = -EINVAL;
528 goto err; 532 goto err;
@@ -648,5 +652,8 @@ MODULE_PARM_DESC(mode_option, "video mode (<x>x<y>[-<bpp>][@<refr>])");
648module_param(vram, int, 0); 652module_param(vram, int, 0);
649MODULE_PARM_DESC(vram, "video memory size"); 653MODULE_PARM_DESC(vram, "video memory size");
650 654
655module_param(vt_switch, int, 0);
656MODULE_PARM_DESC(vt_switch, "enable VT switch during suspend/resume");
657
651MODULE_DESCRIPTION("Framebuffer driver for the AMD Geode LX"); 658MODULE_DESCRIPTION("Framebuffer driver for the AMD Geode LX");
652MODULE_LICENSE("GPL"); 659MODULE_LICENSE("GPL");