xf86-video-intel: src/drmmode_display.c

Chris Wilson ickle at kemper.freedesktop.org
Sat Mar 6 11:52:29 PST 2010


 src/drmmode_display.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 8ece6cf5afa1bb0d8d9328696422f42f3c3adbd6
Author: Robert Hooker <sarvatt at ubuntu.com>
Date:   Sat Mar 6 14:09:12 2010 -0500

    Fix build against xserver 1.6 branch.
    
    Signed-off-by: Robert Hooker <sarvatt at ubuntu.com>
    Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index b1531bd..22c967a 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -701,7 +701,11 @@ drmmode_output_lvds_edid(xf86OutputPtr output, DisplayModePtr modes)
 	max_vrefresh = max(max_vrefresh, 60.0);
 	max_vrefresh *= (1 + SYNC_TOLERANCE);
 
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,6,99,0,0)
 	m = xf86GetDefaultModes();
+#else
+	m = xf86GetDefaultModes(0,0);
+#endif
 
 	xf86ValidateModesSize(output->scrn, m, max_x, max_y, 0);
 


More information about the xorg-commit mailing list