summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwain Ainsworth <oga@openbsd.org>2009-01-11 19:20:28 +0100
committerMatthieu Herrb <matthieu.herrb@laas.fr>2009-01-11 19:20:28 +0100
commit6d0406c7c1787a5d69bd9e6d006b09b2eacda95f (patch)
tree6cdaf61cda15059e3e9f4b21058d26fcba5b4a99
parentb52e433ead1ff1fde8e93b99e228a7fd5f704453 (diff)
Don't call the MODESET_CTL ioctl on the drm device if direct rendering
isn't enabled. From upstream, patch originally from me.
-rw-r--r--src/legacy_crtc.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/legacy_crtc.c b/src/legacy_crtc.c
index 3df61a7a..314ecf02 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;