[src/trunk]: src/sys/arch attach drm hw drivers to 'drm' not 'vga'

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

details:   https://anonhg.NetBSD.org/src/rev/fc306676e1aa
branches:  trunk
changeset: 761930:fc306676e1aa
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Fri Feb 11 01:59:56 2011 +0000

description:
attach drm hw drivers to 'drm' not 'vga'

diffstat:

 sys/arch/amd64/conf/GENERIC |  20 ++++++++++----------
 sys/arch/amd64/conf/INSTALL |  20 ++++++++++----------
 sys/arch/i386/conf/ALL      |  22 +++++++++++-----------
 sys/arch/i386/conf/GENERIC  |  22 +++++++++++-----------
 sys/arch/i386/conf/INSTALL  |  21 +++++++++++----------
 5 files changed, 53 insertions(+), 52 deletions(-)

diffs (204 lines):

diff -r d5cd3d6da3dd -r fc306676e1aa sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Fri Feb 11 01:13:02 2011 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Fri Feb 11 01:59:56 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.301 2011/02/06 23:25:16 jmcneill Exp $
+# $NetBSD: GENERIC,v 1.302 2011/02/11 02:06:09 jmcneill Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.301 $"
+#ident                 "GENERIC-$Revision: 1.302 $"
 
 maxusers       64              # estimated number of users
 
@@ -374,14 +374,14 @@
 sysbeep0       at pcppi?
 
 # DRI driver
-i915drm*       at vga?         # Intel i915, i945 DRM driver
-mach64drm*     at vga?         # mach64 (3D Rage Pro, Rage) DRM driver
-mgadrm*                at vga?         # Matrox G[24]00, G[45]50 DRM driver
-r128drm*       at vga?         # ATI Rage 128 DRM driver
-radeondrm*     at vga?         # ATI Radeon DRM driver
-savagedrm*     at vga?         # S3 Savage DRM driver
-sisdrm*                at vga?         # SiS DRM driver
-tdfxdrm*       at vga?         # 3dfx (voodoo) DRM 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
 
 # Cryptographic Devices
 
diff -r d5cd3d6da3dd -r fc306676e1aa sys/arch/amd64/conf/INSTALL
--- a/sys/arch/amd64/conf/INSTALL       Fri Feb 11 01:13:02 2011 +0000
+++ b/sys/arch/amd64/conf/INSTALL       Fri Feb 11 01:59:56 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.82 2009/08/09 21:32:16 christos Exp $
+# $NetBSD: INSTALL,v 1.83 2011/02/11 02:06:09 jmcneill Exp $
 #
 #      INSTALL - Installation kernel.
 #
@@ -7,7 +7,7 @@
 
 include        "arch/amd64/conf/GENERIC"
 
-#ident                 "INSTALL-$Revision: 1.82 $"
+#ident                 "INSTALL-$Revision: 1.83 $"
 
 no options     MEMORY_DISK_DYNAMIC
 options        MEMORY_DISK_IS_ROOT     # force root on memory disk
@@ -17,11 +17,11 @@
 
 no options     MTRR
 # DRI driver
-no i915drm*    at vga?         # Intel i915, i945 DRM driver
-no mach64drm*  at vga?         # mach64 (3D Rage Pro, Rage) DRM driver
-no mgadrm*     at vga?         # Matrox G[24]00, G[45]50 DRM driver
-no r128drm*    at vga?         # ATI Rage 128 DRM driver
-no radeondrm*  at vga?         # ATI Radeon DRM driver
-no savagedrm*  at vga?         # S3 Savage DRM driver
-no sisdrm*     at vga?         # SiS DRM driver
-no tdfxdrm*    at vga?         # 3dfx (voodoo) DRM 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
diff -r d5cd3d6da3dd -r fc306676e1aa sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL    Fri Feb 11 01:13:02 2011 +0000
+++ b/sys/arch/i386/conf/ALL    Fri Feb 11 01:59:56 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.285 2011/01/17 15:56:03 jmcneill Exp $
+# $NetBSD: ALL,v 1.286 2011/02/11 01:59:56 jmcneill 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.285 $"
+#ident                 "ALL-$Revision: 1.286 $"
 
 maxusers       64              # estimated number of users
 
@@ -593,15 +593,15 @@
 wsdisplay*     at xboxfb? console ?
 
 # DRI driver
-i915drm*       at vga?         # Intel i915, i945 DRM driver
-mach64drm*     at vga?         # mach64 (3D Rage Pro, Rage) DRM driver
-mgadrm*        at vga?         # Matrox G[24]00, G[45]50 DRM driver
-r128drm*       at vga?         # ATI Rage 128 DRM driver
-radeondrm*     at vga?         # ATI Radeon DRM driver
-savagedrm*     at vga?         # S3 Savage DRM driver
-sisdrm*        at vga?         # SiS DRM driver
-tdfxdrm*       at vga?         # 3dfx (voodoo) DRM driver
-viadrm*        at vga?         # VIA UniChrome DRM 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 UniChrome DRM driver
 
 attimer0       at isa?
 pcppi0         at isa?
diff -r d5cd3d6da3dd -r fc306676e1aa sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Fri Feb 11 01:13:02 2011 +0000
+++ b/sys/arch/i386/conf/GENERIC        Fri Feb 11 01:59:56 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1010 2011/02/07 04:05:49 jmcneill Exp $
+# $NetBSD: GENERIC,v 1.1011 2011/02/11 01:59:57 jmcneill Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.1010 $"
+#ident                 "GENERIC-$Revision: 1.1011 $"
 
 maxusers       64              # estimated number of users
 
@@ -564,15 +564,15 @@
 sysbeep0       at pcppi?
 
 # DRI driver
-i915drm*       at vga?         # Intel i915, i945 DRM driver
-mach64drm*     at vga?         # mach64 (3D Rage Pro, Rage) DRM driver
-mgadrm*                at vga?         # Matrox G[24]00, G[45]50 DRM driver
-r128drm*       at vga?         # ATI Rage 128 DRM driver
-radeondrm*     at vga?         # ATI Radeon DRM driver
-savagedrm*     at vga?         # S3 Savage DRM driver
-sisdrm*                at vga?         # SiS DRM driver
-tdfxdrm*       at vga?         # 3dfx (voodoo) DRM driver
-viadrm*                at vga?         # VIA DRM 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
 
 # Serial Devices
 
diff -r d5cd3d6da3dd -r fc306676e1aa sys/arch/i386/conf/INSTALL
--- a/sys/arch/i386/conf/INSTALL        Fri Feb 11 01:13:02 2011 +0000
+++ b/sys/arch/i386/conf/INSTALL        Fri Feb 11 01:59:56 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.328 2011/02/10 16:49:19 jym Exp $
+# $NetBSD: INSTALL,v 1.329 2011/02/11 01:59:57 jmcneill Exp $
 #
 #      INSTALL - Installation kernel.
 #
@@ -7,7 +7,7 @@
 
 include        "arch/i386/conf/MONOLITHIC"
 
-#ident                 "INSTALL-$Revision: 1.328 $"
+#ident                 "INSTALL-$Revision: 1.329 $"
 
 no options     MEMORY_DISK_DYNAMIC
 options        MEMORY_DISK_IS_ROOT     # force root on memory disk
@@ -16,11 +16,12 @@
 options        MEMORY_DISK_RBFLAGS=RB_SINGLE   # boot in single-user mode
 
 # DRI driver
-no i915drm*    at vga?         # Intel i915, i945 DRM driver
-no mach64drm*  at vga?         # mach64 (3D Rage Pro, Rage) DRM driver
-no mgadrm*     at vga?         # Matrox G[24]00, G[45]50 DRM driver
-no r128drm*    at vga?         # ATI Rage 128 DRM driver
-no radeondrm*  at vga?         # ATI Radeon DRM driver
-no savagedrm*  at vga?         # S3 Savage DRM driver
-no sisdrm*     at vga?         # SiS DRM driver
-no tdfxdrm*    at vga?         # 3dfx (voodoo) DRM 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