Re: [Bugme-new] [Bug 9847] New: i810fb: module parameter 'mode_option' inconsistent with other framebuffer modules
flat view
From: <hidden>
Date: 2008-02-01 07:01:39
On Tue, 29 Jan 2008 21:02:39 -0800 (PST) bugme-daemon@bugzilla.kernel.org wrote:quoted
Problem Description: While all other framebuffer modules use the option "mode=..." to specify a modedb-style video mode, i810fb uses thenon-standardquoted
"mode_option=..."
The attached patch should fix it. -- From: Krzysztof Helt <redacted> This patch changes the option "mode_option" into "mode". Signed-off-by: Krzysztof Helt <redacted> --- If the patch below is mangled by my web based email client please use the attached one. The patch was done against 2.6.24-git9. diff -urp linux-ref/drivers/video/i810/i810_main.c linux-pc/drivers/video/i810/i810_main.c
--- linux-ref/drivers/video/i810/i810_main.c 2008-01-24 23:58:37.000000000 +0100
+++ linux-pc/drivers/video/i810/i810_main.c 2008-01-31 20:43:56.000000000 +0100@@ -132,7 +132,7 @@ static struct pci_driver i810fb_driver = .resume = i810fb_resume, }; -static char *mode_option __devinitdata = NULL; +static char *mode __devinitdata; static int vram __devinitdata = 4; static int bpp __devinitdata = 8; static int mtrr __devinitdata;
@@ -1891,7 +1891,7 @@ i810_allocate_pci_resource(struct i810fb static void __devinit i810fb_find_init_mode(struct fb_info *info) { - struct fb_videomode mode; + struct fb_videomode mode_new; struct fb_var_screeninfo var; struct fb_monspecs *specs = &info->monspecs; int found = 0;
@@ -1902,7 +1902,7 @@ static void __devinit i810fb_find_init_m #endif INIT_LIST_HEAD(&info->modelist); - memset(&mode, 0, sizeof(struct fb_videomode)); + memset(&mode_new, 0, sizeof(struct fb_videomode)); var = info->var; #ifdef CONFIG_FB_I810_I2C i810_create_i2c_busses(par);
@@ -1928,23 +1928,23 @@ static void __devinit i810fb_find_init_m if (xres && yres) { if ((m = fb_find_best_mode(&var, &info->modelist))) { - mode = *m; + mode_new = *m; found = 1; } } if (!found) { m = fb_find_best_display(&info->monspecs, &info->modelist); - mode = *m; + mode_new = *m; found = 1; } - fb_videomode_to_var(&var, &mode); + fb_videomode_to_var(&var, &mode_new); } #endif - if (mode_option) - fb_find_mode(&var, info, mode_option, specs->modedb, - specs->modedb_len, (found) ? &mode : NULL, + if (mode) + fb_find_mode(&var, info, mode, specs->modedb, + specs->modedb_len, (found) ? &mode_new : NULL, info->var.bits_per_pixel); info->var = var;
@@ -1998,7 +1998,7 @@ static int __devinit i810fb_setup(char * else if (!strncmp(this_opt, "ddc3", 4)) ddc3 = 3; else - mode_option = this_opt; + mode = this_opt; } return 0; }
@@ -2202,8 +2202,8 @@ MODULE_PARM_DESC(dcolor, "use DirectColo " (default = 0 = TrueColor)"); module_param(ddc3, bool, 0); MODULE_PARM_DESC(ddc3, "Probe DDC bus 3 (default = 0 = no)"); -module_param(mode_option, charp, 0); -MODULE_PARM_DESC(mode_option, "Specify initial video mode"); +module_param(mode, charp, 0); +MODULE_PARM_DESC(mode, "Specify initial video mode"); MODULE_AUTHOR("Tony A. Daplas"); MODULE_DESCRIPTION("Framebuffer device for the Intel 810/815 and" ----------------------------------------------------------------------
Lezac w wannie skorzystala z ... Kliknij >>> http://link.interia.pl/f1ce9