summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorbjs <bjs@pkgsrc.org>2008-09-18 20:31:25 +0000
committerbjs <bjs@pkgsrc.org>2008-09-18 20:31:25 +0000
commit4a8317ce9ab733a0c5b0c89c5adc95de1a02c148 (patch)
tree9ba4c01d167ca15f64ab6bf5603301b5c7fa14c0 /x11
parentf666efcb38bb9561f0965bb778fd01f367379de8 (diff)
downloadpkgsrc-4a8317ce9ab733a0c5b0c89c5adc95de1a02c148.tar.gz
This patch ensures the driver won't use the DRM's MODESET_CTL
unless direct rendering is enabled. From Owain Ainsworth <oga@openbsd.org>. PKGREVISION++
Diffstat (limited to 'x11')
-rw-r--r--x11/xf86-video-ati/Makefile3
-rw-r--r--x11/xf86-video-ati/distinfo3
-rw-r--r--x11/xf86-video-ati/patches/patch-aa19
3 files changed, 23 insertions, 2 deletions
diff --git a/x11/xf86-video-ati/Makefile b/x11/xf86-video-ati/Makefile
index 02302244a08..e5b201e0fc7 100644
--- a/x11/xf86-video-ati/Makefile
+++ b/x11/xf86-video-ati/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2008/07/14 04:01:06 tnn Exp $
+# $NetBSD: Makefile,v 1.8 2008/09/18 20:31:25 bjs Exp $
DISTNAME= xf86-video-ati-6.9.0
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/xf86-video-ati/distinfo b/x11/xf86-video-ati/distinfo
index 46b9ae76385..bbd7ab5d1e2 100644
--- a/x11/xf86-video-ati/distinfo
+++ b/x11/xf86-video-ati/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2008/07/14 04:01:07 tnn Exp $
+$NetBSD: distinfo,v 1.6 2008/09/18 20:31:26 bjs Exp $
SHA1 (xf86-video-ati-6.9.0.tar.bz2) = 558f94b76e1b4c3c4429ab1fdc3e3c8523e414dc
RMD160 (xf86-video-ati-6.9.0.tar.bz2) = 7c990dc8c770865d6c8a45e4861207c1dda07a13
Size (xf86-video-ati-6.9.0.tar.bz2) = 777455 bytes
+SHA1 (patch-aa) = fbdfc1d962205242332afc9524632723af82e8bf
SHA1 (patch-ac) = 605892e355f028d83b5db112f5c68a72bcc5e4b0
diff --git a/x11/xf86-video-ati/patches/patch-aa b/x11/xf86-video-ati/patches/patch-aa
new file mode 100644
index 00000000000..2e8c5a6dacd
--- /dev/null
+++ b/x11/xf86-video-ati/patches/patch-aa
@@ -0,0 +1,19 @@
+$NetBSD: patch-aa,v 1.3 2008/09/18 20:31:26 bjs Exp $
+
+This patch ensures the driver won't use the DRM's MODESET_CTL
+unless direct rendering is enabled.
+
+From Owain Ainsworth <oga@openbsd.org>.
+
+--- src/legacy_crtc.c.orig 2008-06-25 02:56:40.000000000 -0400
++++ src/legacy_crtc.c
+@@ -625,6 +625,9 @@ radeon_crtc_modeset_ioctl(xf86CrtcPtr cr
+ 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;
+