xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/ddc/print_edid.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit fb882b3da189847bc98b646faddac9e8b42aa435
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Jun 16 14:58:10 2009 -0400

    EDID: Carp about 1.4 monitors with no preferred refresh rate
    
    You would think, having finally tightened down the spec, that
    monitor vendors would bother to implement what the spec actually
    mandates.  You would be wrong.

diff --git a/hw/xfree86/ddc/print_edid.c b/hw/xfree86/ddc/print_edid.c
index e16dcbb..c2723da 100644
--- a/hw/xfree86/ddc/print_edid.c
+++ b/hw/xfree86/ddc/print_edid.c
@@ -398,8 +398,12 @@ print_detailed_monitor_section(int scrnIndex,
 		if (r->supported_scaling & SCALING_VSTRETCH)
 		    xf86ErrorF(" vstretch");
 		xf86ErrorF("\n");
-		xf86DrvMsg(scrnIndex, X_INFO, "Preferred refresh rate: %d\n",
-			   r->preferred_refresh);
+		if (r->preferred_refresh)
+		    xf86DrvMsg(scrnIndex, X_INFO, "Preferred refresh rate: %d\n",
+			       r->preferred_refresh);
+		else
+		    xf86DrvMsg(scrnIndex, X_INFO, "Buggy monitor, no preferred "
+			       "refresh rate given\n");
 	    } else if (r->max_clock != 0) {
 		xf86ErrorF(" PixClock max %i MHz\n", r->max_clock);
 	    } else {