Module Name: src
Committed By: christos
Date: Sun Nov 2 23:14:20 UTC 2014
Modified Files:
src/sys/arch/i386/conf: ALL GENERIC INSTALL
Removed Files:
src/sys/arch/i386/conf: DRMKMS NO_DRM
Log Message:
switch to DRMKMS drivers
To generate a diff of this commit:
cvs rdiff -u -r1.387 -r1.388 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.6 -r0 src/sys/arch/i386/conf/DRMKMS
cvs rdiff -u -r1.1115 -r1.1116 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.330 -r1.331 src/sys/arch/i386/conf/INSTALL
cvs rdiff -u -r1.1 -r0 src/sys/arch/i386/conf/NO_DRM
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.387 src/sys/arch/i386/conf/ALL:1.388
--- src/sys/arch/i386/conf/ALL:1.387 Sat Oct 18 12:56:51 2014
+++ src/sys/arch/i386/conf/ALL Sun Nov 2 18:14:20 2014
@@ -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 @@ include "arch/i386/conf/std.i386"
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 @@ voodoofb* at pci? dev ? function ?
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?
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1115 src/sys/arch/i386/conf/GENERIC:1.1116
--- src/sys/arch/i386/conf/GENERIC:1.1115 Sat Oct 18 12:56:51 2014
+++ src/sys/arch/i386/conf/GENERIC Sun Nov 2 18:14:20 2014
@@ -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 @@ include "arch/i386/conf/std.i386"
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 @@ attimer0 at isa?
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
Index: src/sys/arch/i386/conf/INSTALL
diff -u src/sys/arch/i386/conf/INSTALL:1.330 src/sys/arch/i386/conf/INSTALL:1.331
--- src/sys/arch/i386/conf/INSTALL:1.330 Sat May 28 09:01:50 2011
+++ src/sys/arch/i386/conf/INSTALL Sun Nov 2 18:14:20 2014
@@ -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_SERVER=0 # no users
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?
