patch-2.2.6 linux/drivers/video/vesafb.c

• Lines: 27
• Date: Mon Apr 12 09:57:34 1999
• Orig file: v2.2.5/linux/drivers/video/vesafb.c
• Orig date: Wed Mar 10 15:29:48 1999

diff -u --recursive --new-file v2.2.5/linux/drivers/video/vesafb.c linux/drivers/video/vesafb.c
@@ -93,6 +93,7 @@
 } fbcon_cmap;
 
 static int             inverse   = 0;
+static int             mtrr      = 0;
 static int             currcon   = 0;
 
 static int             pmi_setpal = 0;	/* pmi for palette changes ??? */
@@ -495,6 +496,8 @@
 			pmi_setpal=0;
 		else if (! strcmp(this_opt, "pmipal"))
 			pmi_setpal=1;
+		else if (! strcmp(this_opt, "mtrr"))
+			mtrr=1;
 		else if (!strncmp(this_opt, "font:", 5))
 			strcpy(fb_info.fontname, this_opt+5);
 	}
@@ -633,7 +636,8 @@
 	}
 	request_region(0x3c0, 32, "vga+");
 #ifdef CONFIG_MTRR
-        mtrr_add((unsigned long)video_base, video_size, MTRR_TYPE_WRCOMB, 1);
+	if (mtrr)
+		mtrr_add((unsigned long)video_base, video_size, MTRR_TYPE_WRCOMB, 1);
 #endif
 	
 	strcpy(fb_info.modename, "VESA VGA");