aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/geode/gxfb_core.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/video/geode/gxfb_core.c b/drivers/video/geode/gxfb_core.c
index 151d964c025a..f16c21d5bc21 100644
--- a/drivers/video/geode/gxfb_core.c
+++ b/drivers/video/geode/gxfb_core.c
@@ -29,6 +29,7 @@
29#include <linux/delay.h> 29#include <linux/delay.h>
30#include <linux/fb.h> 30#include <linux/fb.h>
31#include <linux/console.h> 31#include <linux/console.h>
32#include <linux/suspend.h>
32#include <linux/init.h> 33#include <linux/init.h>
33#include <linux/pci.h> 34#include <linux/pci.h>
34#include <asm/geode.h> 35#include <asm/geode.h>
@@ -37,6 +38,7 @@
37 38
38static char *mode_option; 39static char *mode_option;
39static int vram; 40static int vram;
41static int vt_switch;
40 42
41/* Modes relevant to the GX (taken from modedb.c) */ 43/* Modes relevant to the GX (taken from modedb.c) */
42static const struct fb_videomode gx_modedb[] __initdata = { 44static const struct fb_videomode gx_modedb[] __initdata = {
@@ -382,6 +384,8 @@ static int __init gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *i
382 gxfb_check_var(&info->var, info); 384 gxfb_check_var(&info->var, info);
383 gxfb_set_par(info); 385 gxfb_set_par(info);
384 386
387 pm_set_vt_switch(vt_switch);
388
385 if (register_framebuffer(info) < 0) { 389 if (register_framebuffer(info) < 0) {
386 ret = -EINVAL; 390 ret = -EINVAL;
387 goto err; 391 goto err;
@@ -502,5 +506,8 @@ MODULE_PARM_DESC(mode_option, "video mode (<x>x<y>[-<bpp>][@<refr>])");
502module_param(vram, int, 0); 506module_param(vram, int, 0);
503MODULE_PARM_DESC(vram, "video memory size"); 507MODULE_PARM_DESC(vram, "video memory size");
504 508
509module_param(vt_switch, int, 0);
510MODULE_PARM_DESC(vt_switch, "enable VT switch during suspend/resume");
511
505MODULE_DESCRIPTION("Framebuffer driver for the AMD Geode GX"); 512MODULE_DESCRIPTION("Framebuffer driver for the AMD Geode GX");
506MODULE_LICENSE("GPL"); 513MODULE_LICENSE("GPL");