From b6b1e89e02be3949edc7c40e2b95d7d30fb42048 Mon Sep 17 00:00:00 2001 From: oga Date: Tue, 26 Aug 2008 16:38:56 +0000 Subject: [PATCH] Don't call the MODESET_CTL ioctl on the drm device if direct rendering isn't enabled. From upstream, patch originally from me. --- driver/xf86-video-ati/src/legacy_crtc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/driver/xf86-video-ati/src/legacy_crtc.c b/driver/xf86-video-ati/src/legacy_crtc.c index 3df61a7aa..314ecf020 100644 --- a/driver/xf86-video-ati/src/legacy_crtc.c +++ b/driver/xf86-video-ati/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;