d734ab4
From ca85ebddd804305322014c6a71b4122a56c5e634 Mon Sep 17 00:00:00 2001
50f2416
From: Adam Jackson <ajax@redhat.com>
d734ab4
Date: Thu, 4 Mar 2010 15:18:38 +1000
50f2416
Subject: [PATCH] tweak default mode list yet again
50f2416
50f2416
---
50f2416
 hw/xfree86/modes/xf86Crtc.c |    5 ++++-
50f2416
 1 files changed, 4 insertions(+), 1 deletions(-)
50f2416
50f2416
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
d734ab4
index 03277be..571ffd0 100644
50f2416
--- a/hw/xfree86/modes/xf86Crtc.c
50f2416
+++ b/hw/xfree86/modes/xf86Crtc.c
d734ab4
@@ -1582,7 +1582,7 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
50f2416
 	int		    min_clock = 0;
50f2416
 	int		    max_clock = 0;
50f2416
 	double		    clock;
50f2416
-	Bool                add_default_modes = TRUE;
50f2416
+	Bool                add_default_modes;
73b55c8
 	Bool		    debug_modes = config->debug_modes ||
73b55c8
 					  xf86Initialising;
d734ab4
 	enum det_monrec_source sync_source = sync_default;
d734ab4
@@ -1628,6 +1628,9 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
50f2416
 	}
50f2416
 	
50f2416
 	output_modes = (*output->funcs->get_modes) (output);
50f2416
+
50f2416
+	/* if the driver found modes, don't second-guess it */
50f2416
+	add_default_modes = (output_modes == NULL);
50f2416
 	
50f2416
 	edid_monitor = output->MonInfo;
50f2416
 	
50f2416
-- 
d734ab4
1.6.6.1
50f2416