[src/trunk]: src/sys/arch/i386/conf switch to DRMKMS drivers

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

details:   https://anonhg.NetBSD.org/src/rev/6d3048d1e64a
branches:  trunk
changeset: 803560:6d3048d1e64a
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Nov 02 23:14:20 2014 +0000

description:
switch to DRMKMS drivers

diffstat:

 sys/arch/i386/conf/ALL     |  35 ++++++++++++++++++++++-------------
 sys/arch/i386/conf/DRMKMS  |  16 ----------------
 sys/arch/i386/conf/GENERIC |  33 +++++++++++++++++++++------------
 sys/arch/i386/conf/INSTALL |  18 ++++++------------
 sys/arch/i386/conf/NO_DRM  |  11 -----------
 5 files changed, 49 insertions(+), 64 deletions(-)

diffs (181 lines):

diff -r 14940750c45c -r 6d3048d1e64a sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL    Sun Nov 02 23:12:00 2014 +0000
+++ b/sys/arch/i386/conf/ALL    Sun Nov 02 23:14:20 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.387 2014/10/18 16:56:51 uebayasi Exp $
+# $NetBSD: ALL,v 1.388 2014/11/02 23:14:20 christos Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "ALL-$Revision: 1.387 $"
+#ident                 "ALL-$Revision: 1.388 $"
 
 maxusers       64              # estimated number of users
 
@@ -592,17 +592,26 @@
 wcfb*  at pci? dev ? function ?
 wsdisplay*     at wsemuldisplaydev?
 
-# 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
-vboxdrm*       at drm?         # VirtualBox DRM driver
-viadrm*        at drm?         # VIA UniChrome 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
+#vboxdrm*      at drm?         # VirtualBox DRM driver
+#viadrm*       at drm?         # VIA UniChrome DRM driver
+
+i915drmkms*    at pci? dev ? function ?
+intelfb*       at intelfbbus?
+
+radeon*        at pci? dev ? function ?
+radeondrmkmsfb* at radeonfbbus?
+
+#nouveau*      at pci? dev ? function ?
+#nouveaufb*    at nouveaufbbus
 
 attimer0       at isa?
 pcppi0         at isa?
diff -r 14940750c45c -r 6d3048d1e64a sys/arch/i386/conf/DRMKMS
--- a/sys/arch/i386/conf/DRMKMS Sun Nov 02 23:12:00 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-include "arch/i386/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
diff -r 14940750c45c -r 6d3048d1e64a sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Sun Nov 02 23:12:00 2014 +0000
+++ b/sys/arch/i386/conf/GENERIC        Sun Nov 02 23:14:20 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1115 2014/10/18 16:56:51 uebayasi Exp $
+# $NetBSD: GENERIC,v 1.1116 2014/11/02 23:14:20 christos Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.1115 $"
+#ident                 "GENERIC-$Revision: 1.1116 $"
 
 maxusers       64              # estimated number of users
 
@@ -557,16 +557,25 @@
 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
+
+i915drmkms*    at pci? dev ? function ?
+intelfb*       at intelfbbus?
+
+radeon*        at pci? dev ? function ?
+radeondrmkmsfb* at radeonfbbus?
+
+#nouveau*      at pci? dev ? function ?
+#nouveaufb*    at nouveaufbbus
 
 # Serial Devices
 
diff -r 14940750c45c -r 6d3048d1e64a sys/arch/i386/conf/INSTALL
--- a/sys/arch/i386/conf/INSTALL        Sun Nov 02 23:12:00 2014 +0000
+++ b/sys/arch/i386/conf/INSTALL        Sun Nov 02 23:14:20 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.330 2011/05/28 13:01:50 ryo Exp $
+# $NetBSD: INSTALL,v 1.331 2014/11/02 23:14:20 christos Exp $
 #
 #      INSTALL - Installation kernel.
 #
@@ -7,7 +7,7 @@
 
 include        "arch/i386/conf/MONOLITHIC"
 
-#ident                 "INSTALL-$Revision: 1.330 $"
+#ident                 "INSTALL-$Revision: 1.331 $"
 
 no options     MEMORY_DISK_DYNAMIC
 options        MEMORY_DISK_IS_ROOT     # force root on memory disk
@@ -15,13 +15,7 @@
 options        MEMORY_DISK_ROOT_SIZE=10000     # size of memory disk, in blocks
 options        MEMORY_DISK_RBFLAGS=RB_SINGLE   # boot in single-user mode
 
-# DRI driver
-no i915drm*    at drm?         # Intel i915, i945 DRM driver
-no mach64drm*  at drm?         # mach64 (3D Rage Pro, Rage) DRM driver
-no mgadrm*     at drm?         # Matrox G[24]00, G[45]50 DRM driver
-no r128drm*    at drm?         # ATI Rage 128 DRM driver
-no radeondrm*  at drm?         # ATI Radeon DRM driver
-no savagedrm*  at drm?         # S3 Savage DRM driver
-no sisdrm*     at drm?         # SiS DRM driver
-no tdfxdrm*    at drm?         # 3dfx (voodoo) DRM driver
-no viadrm*     at drm?         # VIA DRM driver
+# DRMKMS driver
+no i915drmkms*     at pci?
+no radeon*         at pci?
+#no nouveau*      at pci?
diff -r 14940750c45c -r 6d3048d1e64a sys/arch/i386/conf/NO_DRM
--- a/sys/arch/i386/conf/NO_DRM Sun Nov 02 23:12:00 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-include "arch/i386/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?