Module Name: src
Committed By: christos
Date: Sun Nov 2 23:12:01 UTC 2014
Modified Files:
src/sys/arch/amd64/conf: ALL INSTALL
Log Message:
propagate drm changes
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.89 -r1.90 src/sys/arch/amd64/conf/INSTALL
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/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.21 src/sys/arch/amd64/conf/ALL:1.22
--- src/sys/arch/amd64/conf/ALL:1.21 Sat Oct 18 12:56:51 2014
+++ src/sys/arch/amd64/conf/ALL Sun Nov 2 18:12:00 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.21 2014/10/18 16:56:51 uebayasi Exp $
+# $NetBSD: ALL,v 1.22 2014/11/02 23:12:00 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/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.21 $"
+#ident "ALL-$Revision: 1.22 $"
maxusers 64 # estimated number of users
@@ -514,17 +514,27 @@ 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
+
+# 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
attimer0 at isa?
pcppi0 at isa?
Index: src/sys/arch/amd64/conf/INSTALL
diff -u src/sys/arch/amd64/conf/INSTALL:1.89 src/sys/arch/amd64/conf/INSTALL:1.90
--- src/sys/arch/amd64/conf/INSTALL:1.89 Thu Jun 6 03:11:18 2013
+++ src/sys/arch/amd64/conf/INSTALL Sun Nov 2 18:12:00 2014
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.89 2013/06/06 07:11:18 msaitoh Exp $
+# $NetBSD: INSTALL,v 1.90 2014/11/02 23:12:00 christos Exp $
#
# INSTALL - Installation kernel.
#
@@ -8,7 +8,7 @@
include "arch/amd64/conf/GENERIC"
options CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=115200
-#ident "INSTALL-$Revision: 1.89 $"
+#ident "INSTALL-$Revision: 1.90 $"
no options MEMORY_DISK_DYNAMIC
options MEMORY_DISK_IS_ROOT # force root on memory disk
@@ -16,12 +16,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
+# DRMKMS driver
+no i915drmkms* at pci?
+no radeon* at pci?
+#no nouveau* at pci?
