From b076d399344e5b6495e069342f7f862c810c8ece Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mon, 29 Dec 2008 11:34:51 +1000 Subject: modeset: fix xf86CrtcRotate API change across server versions (cherry picked from commit a320541e51818833a6a445707835fbf70e9babd4) --- src/drmmode_display.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/drmmode_display.c b/src/drmmode_display.c index 186ff2d1..47a1dbc0 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); -- cgit v1.2.3