Patch for review and testing

@@ -1889,6 +1889,7 @@
 	ret
 
 store_edid:
+#ifdef CONFIG_EDID_FIRMWARE
 	pushw	%es				# just save all registers 
 	pushw	%ax				
 	pushw	%bx

@@ -1919,6 +1920,7 @@
 	popw	%bx
 	popw	%ax
 	popw	%es	
+#endif         /* CONFIG_EDID_FIRMWARE */
 	ret
 
 # VIDEO_SELECT-only variables

@@ -105,7 +105,9 @@
 	unsigned short length;
 	unsigned char table[0];
 };
+#ifdef CONFIG_EDID_FIRMWARE
 struct edid_info edid_info;
+#endif /* CONFIG_EDID_FIRMWARE */
 struct ist_info ist_info;
 struct e820map e820;
 

@@ -1060,7 +1062,9 @@
  	ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV);
  	drive_info = DRIVE_INFO;
  	screen_info = SCREEN_INFO;
+#ifdef CONFIG_EDID_FIRMWARE
 	edid_info = EDID_INFO;
+#endif /* CONFIG_EDID_FIRMWARE */
 	apm_info.bios = APM_BIOS_INFO;
 	ist_info = IST_INFO;
 	saved_videomode = VIDEO_MODE;

@@ -38,6 +38,18 @@
 	  (e.g. an accelerated X server) and that are not frame buffer
 	  device-aware may cause unexpected results. If unsure, say N.
 
+config EDID_FIRMWARE
+	bool "Get EDID using the platform's firmware"
+	depends on X86
+	default n
+	help
+	  If you choose Y, the EDID (useful for setting video modes) will be
+	  acquired using a BIOS call before the kernel boots to protected mode.
+	  For computers with broken BIOSes, this can hang your computer. This can
+	  also be a very slow process.
+
+	  If unsure, choose N.
+
 config FB_CIRRUS
 	tristate "Cirrus Logic support"
 	depends on FB && (AMIGA || PCI) && BROKEN

@@ -828,42 +828,42 @@
 	printk("========================================\n");
 }
 
-#ifdef CONFIG_PPC_OF
-char *get_EDID_from_OF(struct pci_dev *pdev)
+#ifdef CONFIG_EDID_FIRMWARE
+char *get_EDID_from_Firmware(struct device *dev)
 {
+#ifdef CONFIG_PPC_OF
 	static char *propnames[] =
 	    { "DFP,EDID", "LCD,EDID", "EDID", "EDID1", NULL };
 	unsigned char *pedid = NULL;
 	struct device_node *dp;
+	struct pci_dev *pdev;
 	int i;
 
+	pdev = to_pci_dev(dev);
+	
 	if (pdev == NULL)
 		return NULL;
 	dp = pci_device_to_OF_node(pdev);
-	while (dp != NULL) {
+	while (dp) {
 		for (i = 0; propnames[i] != NULL; ++i) {
 			pedid = (unsigned char *) get_property(dp, propnames[i], NULL);
-			if (pedid != NULL)
+			if (pedid)
 				return pedid;
 		}
 		dp = dp->child;
 	}
-	show_edid(pedid);
-	return pedid;
-}
 #endif
-
 #ifdef CONFIG_X86
-char *get_EDID_from_BIOS(void *dummy)
-{
-	unsigned char *pedid = edid_info.dummy;
-	
+	unsigned char *pedid = NULL;
+
+	pedid = edid_info.dummy;
 	if (!pedid)
 		return NULL;
+#endif	
 	show_edid(pedid);
-	return pedid;				
+	return pedid;
 }
-#endif
+#endif /* CONFIG_EDID_FIRMWARE */
 
 /* 
  * VESA Generalized Timing Formula (GTF) 

@@ -1229,11 +1229,8 @@
 
 EXPORT_SYMBOL(parse_edid);
 EXPORT_SYMBOL(show_edid);
-#ifdef CONFIG_X86
-EXPORT_SYMBOL(get_EDID_from_BIOS);
-#endif
-#ifdef CONFIG_PPC_OF
-EXPORT_SYMBOL(get_EDID_from_OF);
+#ifdef CONFIG_EDID_FIRMWARE
+EXPORT_SYMBOL(get_EDID_from_Firmware);
 #endif
 EXPORT_SYMBOL(fb_get_monitor_limits);
 EXPORT_SYMBOL(fb_get_mode);



-------------------------------------------------------