Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16ef9870 authored by Jordan Crouse's avatar Jordan Crouse Committed by Linus Torvalds
Browse files

[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: default avatarJordan Crouse <jordan.crouse@amd.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Acked-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ab1db0cf

drivers/video/geode/gxfb_core.c

+31 −6
Original line number Diff line number Diff line
@@ -35,10 +35,10 @@ 
#include "display_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) */

static const struct fb_videomode __initdata gx_modedb[] = {

static const struct fb_videomode gx_modedb[] __initdata = {

	/* 640x480-60 VESA */

	{ NULL, 60, 640, 480, 39682,  48, 16, 33, 10, 96, 2,

	  0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
@@ -341,6 +341,7 @@ static int __init gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *i 
		goto err;

	}





	/* Clear the frame buffer of garbage. */

        memset_io(info->screen_base, 0, info->fix.smem_len);
@@ -411,11 +412,35 @@ static struct pci_driver gxfb_driver = { 
	.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)

{

#ifndef MODULE

	if (fb_get_options("gxfb", NULL))

	char *option = NULL;



	if (fb_get_options("gxfb", &option))

		return -ENODEV;



	gxfb_setup(option);

#endif

	return pci_register_driver(&gxfb_driver);

}
@@ -428,8 +453,8 @@ static void __exit gxfb_cleanup(void) 
module_init(gxfb_init);

module_exit(gxfb_cleanup);



module_param_string(mode, mode_option, sizeof(mode_option), 0444);

MODULE_PARM_DESC(mode, "video mode (<x>x<y>[-<bpp>][@<refr>])");

module_param(mode_option, charp, 0);

MODULE_PARM_DESC(mode_option, "video mode (<x>x<y>[-<bpp>][@<refr>])");



MODULE_DESCRIPTION("Framebuffer driver for the AMD Geode GX");

MODULE_LICENSE("GPL");