Skip to contentSkip to conversation

i810fb: Change option ext_vga to extvga to match documentation

PATCH New Antonino A. Daplas 1 participant 1 message Sep 12, 2005 Framebuffer layer

lore
Share & tools
lore

Antonino A. Daplas

author
#0 lore raw

PATCH 3/4 i810fb: Change option ext_vga to extvga to match documentation

Reported by: Manuel Lauss <[email protected]>

He was getting random initial video modes depending on the kernel configuration. His option line includes 'extvga'.

The i810fb documentation describes the option 'extvga', however the driver accepts 'ext_vga'. Besides 'extvga' being ignored by i810fb, it also confuses the option parser of i810fb and assigns 'extvga' to 'mode_option'. This leads to an incorrect video mode at boot time.

Signed-off-by Antonino Daplas <[email protected]>
---
 i810_main.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
drivers/video/i810/i810_main.c +6 -6
@@ -105,7 +105,7 @@ static int xres       __devinitdata;
 static int yres       __devinitdata;
 static int vyres      __devinitdata;
 static int sync       __devinitdata;
-static int ext_vga    __devinitdata;
+static int extvga     __devinitdata;
 static int dcolor     __devinitdata;
 
 /*------------------------------------------------------------*/

@@ -1766,7 +1766,7 @@ static void __devinit i810_init_device(s
 	i810_init_cursor(par);
 
 	/* mvo: enable external vga-connector (for laptops) */
-	if (ext_vga) {
+	if (extvga) {
 		i810_writel(HVSYNC, mmio, 0);
 		i810_writel(PWR_CLKC, mmio, 3);
 	}

@@ -1921,8 +1921,8 @@ static int __devinit i810fb_setup(char *
 			mtrr = 1;
 		else if (!strncmp(this_opt, "accel", 5))
 			accel = 1;
-		else if (!strncmp(this_opt, "ext_vga", 7))
-			ext_vga = 1;
+		else if (!strncmp(this_opt, "extvga", 6))
+			extvga = 1;
 		else if (!strncmp(this_opt, "sync", 4))
 			sync = 1;
 		else if (!strncmp(this_opt, "vram:", 5))

@@ -2151,8 +2151,8 @@ module_param(accel, bool, 0);
 MODULE_PARM_DESC(accel, "Use Acceleration (BLIT) engine (default = 0)");
 module_param(mtrr, bool, 0);
 MODULE_PARM_DESC(mtrr, "Use MTRR (default = 0)");
-module_param(ext_vga, bool, 0);
-MODULE_PARM_DESC(ext_vga, "Enable external VGA connector (default = 0)");
+module_param(extvga, bool, 0);
+MODULE_PARM_DESC(extvga, "Enable external VGA connector (default = 0)");
 module_param(sync, bool, 0);
 MODULE_PARM_DESC(sync, "wait for accel engine to finish drawing"
 		 " (default = 0)");

-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf