xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/legacy_crtc.c |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 64dbadddcf6d069c0472f37afeab89d3e31e937d
Author: Owain Gordon Ainsworth <oga at openbsd.org>
Date:   Mon Jul 28 10:40:58 2008 +1000

    radeon: don't call ioctl unless DRI is initialised

diff --git a/src/legacy_crtc.c b/src/legacy_crtc.c
index f7216f9..334194a 100644
--- a/src/legacy_crtc.c
+++ b/src/legacy_crtc.c
@@ -625,6 +625,9 @@ radeon_crtc_modeset_ioctl(xf86CrtcPtr crtc, Bool post)
     RADEONCrtcPrivatePtr radeon_crtc = crtc->driver_private;
     struct drm_modeset_ctl modeset;
 
+    if (!info->directRenderingEnabled)
+	return;
+
     modeset.crtc = radeon_crtc->crtc_id;
     modeset.cmd = post ? _DRM_POST_MODESET : _DRM_PRE_MODESET;