xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/utils/cvt/cvt.c |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 746e7b22e1bdfbf2363040367209b4c46b1c2fec
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Jun 9 16:20:11 2009 -0400

    cvt: Allow multiple-of-60Hz refresh rates for reduced blanking.
    
    Doing so generates the same timings as given in the DMT spec for
    120Hz RB, so we should be set there.  Other rates might be legal
    too but why push our luck.

diff --git a/hw/xfree86/utils/cvt/cvt.c b/hw/xfree86/utils/cvt/cvt.c
index 500e31f..cf0a479 100644
--- a/hw/xfree86/utils/cvt/cvt.c
+++ b/hw/xfree86/utils/cvt/cvt.c
@@ -261,11 +261,14 @@ main (int argc, char *argv[])
         HDisplay += 8;
     }
 
-    if (Reduced && (VRefresh != 60.0)) {
-        fprintf(stderr, "\nERROR: 60Hz refresh rate required for reduced"
-                " blanking.\n");
-        PrintUsage(argv[0]);
-        return 0;
+    if (Reduced) {
+	if ((VRefresh / 60.0) != floor(VRefresh / 60.0)) {
+	    fprintf(stderr,
+		    "\nERROR: Multiple of 60Hz refresh rate required for "
+		    " reduced blanking.\n");
+	    PrintUsage(argv[0]);
+	    return 0;
+	}
     }
 
     IsCVT = CVTCheckStandard(HDisplay, VDisplay, VRefresh, Reduced, Verbose);