X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fvideo%2Ffbmon.c;h=53beeb4a99981af1a2079201e7fc9c2f26fe27e4;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=de93139ccbb5a5cb265eee0706200b12cde5c551;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c
index de93139cc..53beeb4a9 100644
--- a/drivers/video/fbmon.c
+++ b/drivers/video/fbmon.c
@@ -26,11 +26,12 @@
  * for more details.
  *
  */
+#include <linux/tty.h>
 #include <linux/fb.h>
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <video/edid.h>
 #ifdef CONFIG_PPC_OF
+#include <linux/pci.h>
 #include <asm/prom.h>
 #include <asm/pci-bridge.h>
 #endif
@@ -604,7 +605,6 @@ static int fb_get_monitor_limits(unsigned char *edid, struct fb_monspecs *specs)
 	block = edid + DETAILED_TIMING_DESCRIPTIONS_START;
 
 	DPRINTK("      Monitor Operating Limits: ");
-
 	for (i = 0; i < 4; i++, block += DETAILED_TIMING_DESCRIPTION_SIZE) {
 		if (edid_is_limits_block(block)) {
 			specs->hfmin = H_MIN_RATE * 1000;
@@ -618,12 +618,11 @@ static int fb_get_monitor_limits(unsigned char *edid, struct fb_monspecs *specs)
 			break;
 		}
 	}
-
+	
 	/* estimate monitor limits based on modes supported */
 	if (retval) {
-		struct fb_videomode *modes, *mode;
+		struct fb_videomode *modes;
 		int num_modes, i, hz, hscan, pixclock;
-		int vtotal, htotal;
 
 		modes = fb_create_modedb(edid, &num_modes);
 		if (!modes) {
@@ -633,38 +632,20 @@ static int fb_get_monitor_limits(unsigned char *edid, struct fb_monspecs *specs)
 
 		retval = 0;
 		for (i = 0; i < num_modes; i++) {
-			mode = &modes[i];
+			hz = modes[i].refresh;
 			pixclock = PICOS2KHZ(modes[i].pixclock) * 1000;
-			htotal = mode->xres + mode->right_margin + mode->hsync_len
-				+ mode->left_margin;
-			vtotal = mode->yres + mode->lower_margin + mode->vsync_len
-				+ mode->upper_margin;
-
-			if (mode->vmode & FB_VMODE_INTERLACED)
-				vtotal /= 2;
-
-			if (mode->vmode & FB_VMODE_DOUBLE)
-				vtotal *= 2;
-
-			hscan = (pixclock + htotal / 2) / htotal;
-			hscan = (hscan + 500) / 1000 * 1000;
-			hz = (hscan + vtotal / 2) / vtotal;
+			hscan = (modes[i].yres * 105 * hz + 5000)/100;
 			
 			if (specs->dclkmax == 0 || specs->dclkmax < pixclock)
 				specs->dclkmax = pixclock;
-
 			if (specs->dclkmin == 0 || specs->dclkmin > pixclock)
 				specs->dclkmin = pixclock;
-
 			if (specs->hfmax == 0 || specs->hfmax < hscan)
 				specs->hfmax = hscan;
-
 			if (specs->hfmin == 0 || specs->hfmin > hscan)
 				specs->hfmin = hscan;
-
 			if (specs->vfmax == 0 || specs->vfmax < hz)
 				specs->vfmax = hz;
-
 			if (specs->vfmin == 0 || specs->vfmin > hz)
 				specs->vfmin = hz;
 		}
@@ -1300,7 +1281,8 @@ int fb_validate_mode(const struct fb_var_screeninfo *var, struct fb_info *info)
 		-EINVAL : 0;
 }
 
-#if defined(CONFIG_FIRMWARE_EDID) && defined(CONFIG_X86)
+#if defined(CONFIG_FB_FIRMWARE_EDID) && defined(__i386__)
+#include <linux/pci.h>
 
 /*
  * We need to ensure that the EDID block is only returned for