xf86-video-intel: src/drmmode_display.c

[Dave Airlie]

 src/drmmode_display.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit a320541e51818833a6a445707835fbf70e9babd4
Author: Dave Airlie <airlied at linux.ie>
Date:   Mon Dec 29 11:34:51 2008 +1000

    modeset: fix xf86CrtcRotate API change across server versions

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index a85eb06..8c73fda 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -29,6 +29,8 @@
 #include "config.h"
 #endif
 
+#include "xorgVersion.h"
+
 #ifdef XF86DRM_MODE
 #include "i830.h"
 #include "sarea.h"
@@ -167,9 +169,13 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
 		output_count++;
 	}
 
-	if (!xf86CrtcRotate(crtc)) {
+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,5,99,0,0)
+	if (!xf86CrtcRotate(crtc, mode, rotation))
 		goto done;
-	}
+#else
+	if (!xf86CrtcRotate(crtc))
+		goto done;
+#endif
 
 	drmmode_ConvertToKMode(crtc->scrn, &kmode, mode);