Module Name: src
Committed By: macallan
Date: Wed Aug 13 22:48:16 UTC 2014
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-nv: Makefile
Log Message:
mention NV_TEST_FOR_KERNEL_DRIVER and explain why it isn't enabled for now
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.6 src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.7
--- src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.6 Fri Jun 14 04:43:38 2013
+++ src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile Wed Aug 13 22:48:15 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/06/14 04:43:38 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2014/08/13 22:48:15 macallan Exp $
DRIVER= xf86-video-nv
DRIVER_NAME= nv_drv
@@ -15,6 +15,16 @@ MAN= nv.4
CPPFLAGS+= -DAVOID_VGAHW
.endif
+.if ${MACHINE} == "i386" || ${MACHINE} == "amd64"
+# XXX
+# the test uses pci_device_has_kernel_driver() which, for now at least, only
+# makes sense on x86 ( it just checks if the kernel driver handling the
+# device is vga ) - and even there, genfb and the like don't do anything
+# that would prevent this driver from working. Might need to revisit this once
+# the new DRM2 code has nvidia support
+#CPPFLAGS+= -DNV_TEST_FOR_KERNEL_DRIVER
+.endif
+
CPPFLAGS+= -DHAVE_XAA_H
.include "../Makefile.xf86-driver"
