mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 11:46:19 +00:00
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>
This commit is contained in:
parent
c805df3d62
commit
564820d42a
2 changed files with 9 additions and 0 deletions
|
@ -45,6 +45,8 @@ Accepted options:
|
||||||
mode_option - specify the video mode. Of the form
|
mode_option - specify the video mode. Of the form
|
||||||
<x>x<y>[-<bpp>][@<refresh>]
|
<x>x<y>[-<bpp>][@<refresh>]
|
||||||
vram - size of video ram (normally auto-detected)
|
vram - size of video ram (normally auto-detected)
|
||||||
|
vt_switch - enable vt switching during suspend/resume. The vt
|
||||||
|
switch is slow, but harmless.
|
||||||
|
|
||||||
--
|
--
|
||||||
Andres Salomon <dilinger@debian.org>
|
Andres Salomon <dilinger@debian.org>
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
#include <linux/console.h>
|
#include <linux/console.h>
|
||||||
#include <linux/mm.h>
|
#include <linux/mm.h>
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
|
#include <linux/suspend.h>
|
||||||
#include <linux/delay.h>
|
#include <linux/delay.h>
|
||||||
#include <linux/fb.h>
|
#include <linux/fb.h>
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
|
@ -28,6 +29,7 @@
|
||||||
static char *mode_option;
|
static char *mode_option;
|
||||||
static int noclear, nopanel, nocrt;
|
static int noclear, nopanel, nocrt;
|
||||||
static int vram;
|
static int vram;
|
||||||
|
static int vt_switch;
|
||||||
|
|
||||||
/* Most of these modes are sorted in ascending order, but
|
/* Most of these modes are sorted in ascending order, but
|
||||||
* since the first entry in this table is the "default" mode,
|
* since the first entry in this table is the "default" mode,
|
||||||
|
@ -523,6 +525,8 @@ static int __init lxfb_probe(struct pci_dev *pdev,
|
||||||
lxfb_check_var(&info->var, info);
|
lxfb_check_var(&info->var, info);
|
||||||
lxfb_set_par(info);
|
lxfb_set_par(info);
|
||||||
|
|
||||||
|
pm_set_vt_switch(vt_switch);
|
||||||
|
|
||||||
if (register_framebuffer(info) < 0) {
|
if (register_framebuffer(info) < 0) {
|
||||||
ret = -EINVAL;
|
ret = -EINVAL;
|
||||||
goto err;
|
goto err;
|
||||||
|
@ -648,5 +652,8 @@ MODULE_PARM_DESC(mode_option, "video mode (<x>x<y>[-<bpp>][@<refr>])");
|
||||||
module_param(vram, int, 0);
|
module_param(vram, int, 0);
|
||||||
MODULE_PARM_DESC(vram, "video memory size");
|
MODULE_PARM_DESC(vram, "video memory size");
|
||||||
|
|
||||||
|
module_param(vt_switch, int, 0);
|
||||||
|
MODULE_PARM_DESC(vt_switch, "enable VT switch during suspend/resume");
|
||||||
|
|
||||||
MODULE_DESCRIPTION("Framebuffer driver for the AMD Geode LX");
|
MODULE_DESCRIPTION("Framebuffer driver for the AMD Geode LX");
|
||||||
MODULE_LICENSE("GPL");
|
MODULE_LICENSE("GPL");
|
||||||
|
|
Loading…
Reference in a new issue