[src/trunk]: src/sys/arch/amd64/conf make DRMKMS the default on GENERIC and c...

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

details:   https://anonhg.NetBSD.org/src/rev/13e9eadb464d
branches:  trunk
changeset: 333416:13e9eadb464d
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Nov 02 23:08:40 2014 +0000

description:
make DRMKMS the default on GENERIC and comment out the legacy drivers.

diffstat:

 sys/arch/amd64/conf/DRMKMS  |  20 --------------------
 sys/arch/amd64/conf/GENERIC |  34 ++++++++++++++++++++++------------
 sys/arch/amd64/conf/NO_DRM  |  11 -----------
 3 files changed, 22 insertions(+), 43 deletions(-)

diffs (94 lines):

diff -r 0af8acee77ce -r 13e9eadb464d sys/arch/amd64/conf/DRMKMS
--- a/sys/arch/amd64/conf/DRMKMS        Sun Nov 02 19:40:06 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-include "arch/amd64/conf/NO_DRM"
-
-i915drmkms*    at pci? dev ? function ?
-intelfb*       at intelfbbus?
-
-radeon*                at pci? dev ? function ?
-radeondrmkmsfb* at radeonfbbus?
-
-#nouveau*      at pci? dev ? function ?
-#nouveaufb*    at nouveaufbbus
-
-no options     DIAGNOSTIC
-options        DIAGNOSTIC      # inexpensive kernel consistency checks
-options        DEBUG           # expensive debugging checks/support
-options        LOCKDEBUG       # debug locks
-makeoptions    DEBUG="-g"      # compile full symbol table
-
-#options       ACPIVERBOSE     # verbose ACPI device autoconfig messages
-options        PCIVERBOSE      # verbose PCI device autoconfig messages
-options        USBVERBOSE      # verbose USB device autoconfig messages
diff -r 0af8acee77ce -r 13e9eadb464d sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Sun Nov 02 19:40:06 2014 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Sun Nov 02 23:08:40 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.401 2014/10/26 18:43:18 tls Exp $
+# $NetBSD: GENERIC,v 1.402 2014/11/02 23:08:40 christos Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.401 $"
+#ident                 "GENERIC-$Revision: 1.402 $"
 
 maxusers       64              # estimated number of users
 
@@ -386,16 +386,26 @@
 pcppi0         at isa?
 sysbeep0       at pcppi?
 
-# DRI driver
-i915drm*       at drm?         # Intel i915, i945 DRM driver
-mach64drm*     at drm?         # mach64 (3D Rage Pro, Rage) DRM driver
-mgadrm*        at drm?         # Matrox G[24]00, G[45]50 DRM driver
-r128drm*       at drm?         # ATI Rage 128 DRM driver
-radeondrm*     at drm?         # ATI Radeon DRM driver
-savagedrm*     at drm?         # S3 Savage DRM driver
-sisdrm*        at drm?         # SiS DRM driver
-tdfxdrm*       at drm?         # 3dfx (voodoo) DRM driver
-viadrm*                at drm?         # VIA DRM driver
+# DRI legacy drivers
+#i915drm*      at drm?         # Intel i915, i945 DRM driver
+#mach64drm*    at drm?         # mach64 (3D Rage Pro, Rage) DRM driver
+#mgadrm*       at drm?         # Matrox G[24]00, G[45]50 DRM driver
+#r128drm*      at drm?         # ATI Rage 128 DRM driver
+#radeondrm*    at drm?         # ATI Radeon DRM driver
+#savagedrm*    at drm?         # S3 Savage DRM driver
+#sisdrm*       at drm?         # SiS DRM driver
+#tdfxdrm*      at drm?         # 3dfx (voodoo) DRM driver
+#viadrm*       at drm?         # VIA DRM driver
+
+# DRMKMS drivers
+i915drmkms*     at pci? dev ? function ?
+intelfb*        at intelfbbus?
+
+radeon*         at pci? dev ? function ?
+radeondrmkmsfb* at radeonfbbus?
+
+#nouveau*       at pci? dev ? function ?
+#nouveaufb*     at nouveaufbbus
 
 # Cryptographic Devices
 
diff -r 0af8acee77ce -r 13e9eadb464d sys/arch/amd64/conf/NO_DRM
--- a/sys/arch/amd64/conf/NO_DRM        Sun Nov 02 19:40:06 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-include "arch/amd64/conf/GENERIC"
-
-no i915drm*    at drm?
-no mach64drm*  at drm?
-no mgadrm*     at drm?
-no r128drm*    at drm?
-no radeondrm*  at drm?
-no savagedrm*  at drm?
-no sisdrm*     at drm?
-no tdfxdrm*    at drm?
-no viadrm*     at drm?