summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2013-07-01 13:24:44 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2013-07-01 13:24:44 +0000
commit08b200a0ba8e2312f42cab0cdb92976cfed80331 (patch)
tree9d0096e24f0cfd6396a24b1032c5aa1fddfdd451
parent20c38515f99e51226671311954894c7d6329edc3 (diff)
revert previous. Juan Francisco Cantero Hurtado reports that loading
the dri driver causes xorg to crash with r700 (PCI HD4350). Likely due to the incomplete support for r600/r700 currently in the tree.
-rw-r--r--driver/xf86-video-ati/Makefile.bsd-wrapper6
1 files changed, 4 insertions, 2 deletions
diff --git a/driver/xf86-video-ati/Makefile.bsd-wrapper b/driver/xf86-video-ati/Makefile.bsd-wrapper
index fb2b5221f..039a94c31 100644
--- a/driver/xf86-video-ati/Makefile.bsd-wrapper
+++ b/driver/xf86-video-ati/Makefile.bsd-wrapper
@@ -1,9 +1,11 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.7 2013/06/29 11:13:35 jsg Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.8 2013/07/01 13:24:43 jsg Exp $
.include <bsd.xconf.mk>
+CONFIGURE_ARGS+= --disable-kms
+
.if ${XENOCARA_BUILD_DRI:L} != "yes"
-CONFIGURE_ARGS+= --disable-dri --disable-kms
+CONFIGURE_ARGS+= --disable-dri
.endif
.include <bsd.xorg.mk>