[PATCH] gxfb: Support command line options
Add support for command line options for setting the mode and various settings. [akpm@osdl.org: cleanups] Signed-off-by: Jordan Crouse <jordan.crouse@amd.com> Cc: "Antonino A. Daplas" <adaplas@pol.net> Acked-by: James Simmons <jsimmons@infradead.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
ab1db0cfcf
commit
16ef987095
|
@ -35,10 +35,10 @@
|
||||||
#include "display_gx.h"
|
#include "display_gx.h"
|
||||||
#include "video_gx.h"
|
#include "video_gx.h"
|
||||||
|
|
||||||
static char mode_option[32] = "640x480-16@60";
|
static char *mode_option;
|
||||||
|
|
||||||
/* Modes relevant to the GX (taken from modedb.c) */
|
/* Modes relevant to the GX (taken from modedb.c) */
|
||||||
static const struct fb_videomode __initdata gx_modedb[] = {
|
static const struct fb_videomode gx_modedb[] __initdata = {
|
||||||
/* 640x480-60 VESA */
|
/* 640x480-60 VESA */
|
||||||
{ NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2,
|
{ NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2,
|
||||||
0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
|
0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
|
||||||
|
@ -341,7 +341,8 @@ static int __init gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *i
|
||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Clear the frame buffer of garbage. */
|
|
||||||
|
/* Clear the frame buffer of garbage. */
|
||||||
memset_io(info->screen_base, 0, info->fix.smem_len);
|
memset_io(info->screen_base, 0, info->fix.smem_len);
|
||||||
|
|
||||||
gxfb_check_var(&info->var, info);
|
gxfb_check_var(&info->var, info);
|
||||||
|
@ -411,11 +412,35 @@ static struct pci_driver gxfb_driver = {
|
||||||
.remove = gxfb_remove,
|
.remove = gxfb_remove,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#ifndef MODULE
|
||||||
|
static int __init gxfb_setup(char *options)
|
||||||
|
{
|
||||||
|
|
||||||
|
char *opt;
|
||||||
|
|
||||||
|
if (!options || !*options)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
while ((opt = strsep(&options, ",")) != NULL) {
|
||||||
|
if (!*opt)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
mode_option = opt;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
static int __init gxfb_init(void)
|
static int __init gxfb_init(void)
|
||||||
{
|
{
|
||||||
#ifndef MODULE
|
#ifndef MODULE
|
||||||
if (fb_get_options("gxfb", NULL))
|
char *option = NULL;
|
||||||
|
|
||||||
|
if (fb_get_options("gxfb", &option))
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
|
gxfb_setup(option);
|
||||||
#endif
|
#endif
|
||||||
return pci_register_driver(&gxfb_driver);
|
return pci_register_driver(&gxfb_driver);
|
||||||
}
|
}
|
||||||
|
@ -428,8 +453,8 @@ static void __exit gxfb_cleanup(void)
|
||||||
module_init(gxfb_init);
|
module_init(gxfb_init);
|
||||||
module_exit(gxfb_cleanup);
|
module_exit(gxfb_cleanup);
|
||||||
|
|
||||||
module_param_string(mode, mode_option, sizeof(mode_option), 0444);
|
module_param(mode_option, charp, 0);
|
||||||
MODULE_PARM_DESC(mode, "video mode (<x>x<y>[-<bpp>][@<refr>])");
|
MODULE_PARM_DESC(mode_option, "video mode (<x>x<y>[-<bpp>][@<refr>])");
|
||||||
|
|
||||||
MODULE_DESCRIPTION("Framebuffer driver for the AMD Geode GX");
|
MODULE_DESCRIPTION("Framebuffer driver for the AMD Geode GX");
|
||||||
MODULE_LICENSE("GPL");
|
MODULE_LICENSE("GPL");
|
||||||
|
|
Loading…
Reference in a new issue