[src/netbsd-7]: src/external/mit/xorg/server/drivers/xf86-video-nv Pull up fo...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5ecad1580168
branches:  netbsd-7
changeset: 798274:5ecad1580168
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Aug 21 08:43:42 2014 +0000

description:
Pull up following revision(s) (requested by macallan in ticket #40):
        external/mit/xorg/server/drivers/xf86-video-nv/Makefile: revision 1.7
put pci_device_has_kernel_driver(dev) into #if NV_TEST_FOR_KERNEL_DRIVER
at least for now there is nothing that keeps the nv driver from running
if a kernel driver other than vga is attached
Now this works again on macppc ( and x86 if you use for example genfb )
mention NV_TEST_FOR_KERNEL_DRIVER and explain why it isn't enabled for now

diffstat:

 external/mit/xorg/server/drivers/xf86-video-nv/Makefile |  12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diffs (26 lines):

diff -r 42dda1db4296 -r 5ecad1580168 external/mit/xorg/server/drivers/xf86-video-nv/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-nv/Makefile   Thu Aug 21 08:41:18 2014 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-nv/Makefile   Thu Aug 21 08:43:42 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2013/06/14 04:43:38 mrg Exp $
+#      $NetBSD: Makefile,v 1.6.6.1 2014/08/21 08:43:42 martin Exp $
 
 DRIVER=                xf86-video-nv
 DRIVER_NAME=   nv_drv
@@ -15,6 +15,16 @@
 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"