[pkgsrc/trunk]: pkgsrc/x11/xf86-video-ati This patch ensures the driver won't...

[bjs <bjs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c9fb4f919cba
branches:  trunk
changeset: 547528:c9fb4f919cba
user:      bjs <bjs%pkgsrc.org@localhost>
date:      Thu Sep 18 20:31:25 2008 +0000

description:
This patch ensures the driver won't use the DRM's MODESET_CTL
unless direct rendering is enabled.

>From Owain Ainsworth <oga%openbsd.org@localhost>.

PKGREVISION++

diffstat:

 x11/xf86-video-ati/Makefile         |   3 ++-
 x11/xf86-video-ati/distinfo         |   3 ++-
 x11/xf86-video-ati/patches/patch-aa |  19 +++++++++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diffs (47 lines):

diff -r 7c667a969099 -r c9fb4f919cba x11/xf86-video-ati/Makefile
--- a/x11/xf86-video-ati/Makefile       Thu Sep 18 17:11:01 2008 +0000
+++ b/x11/xf86-video-ati/Makefile       Thu Sep 18 20:31:25 2008 +0000
@@ -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 -r 7c667a969099 -r c9fb4f919cba x11/xf86-video-ati/distinfo
--- a/x11/xf86-video-ati/distinfo       Thu Sep 18 17:11:01 2008 +0000
+++ b/x11/xf86-video-ati/distinfo       Thu Sep 18 20:31:25 2008 +0000
@@ -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 -r 7c667a969099 -r c9fb4f919cba x11/xf86-video-ati/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xf86-video-ati/patches/patch-aa       Thu Sep 18 20:31:25 2008 +0000
@@ -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@localhost>.
+
+--- 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;
+