From 6eb04ab02766c990151c2f4a27fed194f6154ce4 Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Mon, 21 Nov 2011 21:53:57 +0100
Subject: [PATCH] --- yaml --- r: 284847 b: refs/heads/master c:
 03c740a04c8da4204ec6e7c6206e1d8a4a429dbe h: refs/heads/master i:   284845:
 d17fcb0f9eb78168d3f685714adfd0fe95287638   284843:
 31f8a0f0af8665d535e37faacb2a34ac2dbf8339   284839:
 72ef7637f661785d31feef32c59563d67502c37b   284831:
 7799724eb62a454756852a8da9b1d623c640d00c v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/video/amifb.c | 26 ++++++++++++++++++--------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 62b73b67b0e7..87c94ec16b05 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 423a53086ce4095ee66e95778dbbcd6d8c7f3529
+refs/heads/master: 03c740a04c8da4204ec6e7c6206e1d8a4a429dbe
diff --git a/trunk/drivers/video/amifb.c b/trunk/drivers/video/amifb.c
index 421c1f9d74ab..13e7a179f8d4 100644
--- a/trunk/drivers/video/amifb.c
+++ b/trunk/drivers/video/amifb.c
@@ -961,6 +961,11 @@ static int round_down_bpp = 1;	/* for mode probing */
 static int amifb_ilbm = 0;	/* interleaved or normal bitplanes */
 static int amifb_inverse = 0;
 
+static u32 amifb_hfmin __initdata;	/* monitor hfreq lower limit (Hz) */
+static u32 amifb_hfmax __initdata;	/* monitor hfreq upper limit (Hz) */
+static u16 amifb_vfmin __initdata;	/* monitor vfreq lower limit (Hz) */
+static u16 amifb_vfmax __initdata;	/* monitor vfreq upper limit (Hz) */
+
 
 	/*
 	 * Macros for the conversion from real world values to hardware register
@@ -2357,10 +2362,10 @@ static void __init amifb_setup_mcap(char *spec)
 	if (hmax <= 0 || hmax <= hmin)
 		return;
 
-	fb_info.monspecs.vfmin = vmin;
-	fb_info.monspecs.vfmax = vmax;
-	fb_info.monspecs.hfmin = hmin;
-	fb_info.monspecs.hfmax = hmax;
+	amifb_hfmin = hmin;
+	amifb_hfmax = hmax;
+	amifb_vfmin = vmin;
+	amifb_vfmax = vmax;
 }
 
 static int __init amifb_setup(char *options)
@@ -3666,10 +3671,15 @@ static int __init amifb_probe(struct platform_device *pdev)
 		}
 	}
 
-	/*
-	 *  These monitor specs are for a typical Amiga monitor (e.g. A1960)
-	 */
-	if (fb_info.monspecs.hfmin == 0) {
+	if (amifb_hfmin) {
+		fb_info.monspecs.hfmin = amifb_hfmin;
+		fb_info.monspecs.hfmax = amifb_hfmax;
+		fb_info.monspecs.vfmin = amifb_vfmin;
+		fb_info.monspecs.vfmax = amifb_vfmax;
+	} else {
+		/*
+		 *  These are for a typical Amiga monitor (e.g. A1960)
+		 */
 		fb_info.monspecs.hfmin = 15000;
 		fb_info.monspecs.hfmax = 38000;
 		fb_info.monspecs.vfmin = 49;