73b55c
From 8cdd51d13aa003c888cd2a3a42664e2dc60c354c Mon Sep 17 00:00:00 2001
50f241
From: Adam Jackson <ajax@redhat.com>
73b55c
Date: Wed, 20 Jan 2010 14:55:12 +1300
50f241
Subject: [PATCH] tweak default mode list yet again
50f241
50f241
---
50f241
 hw/xfree86/modes/xf86Crtc.c |    5 ++++-
50f241
 1 files changed, 4 insertions(+), 1 deletions(-)
50f241
50f241
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
73b55c
index 23f4a87..0ce631a 100644
50f241
--- a/hw/xfree86/modes/xf86Crtc.c
50f241
+++ b/hw/xfree86/modes/xf86Crtc.c
73b55c
@@ -1578,7 +1578,7 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
50f241
 	int		    min_clock = 0;
50f241
 	int		    max_clock = 0;
50f241
 	double		    clock;
50f241
-	Bool                add_default_modes = TRUE;
50f241
+	Bool                add_default_modes;
73b55c
 	Bool		    debug_modes = config->debug_modes ||
73b55c
 					  xf86Initialising;
50f241
 	enum { sync_config, sync_edid, sync_default } sync_source = sync_default;
73b55c
@@ -1623,6 +1623,9 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
50f241
 	}
50f241
 	
50f241
 	output_modes = (*output->funcs->get_modes) (output);
50f241
+
50f241
+	/* if the driver found modes, don't second-guess it */
50f241
+	add_default_modes = (output_modes == NULL);
50f241
 	
50f241
 	edid_monitor = output->MonInfo;
50f241
 	
50f241
-- 
73b55c
1.6.6
50f241