Module Name: src Committed By: christos Date: Sun Nov 2 23:08:40 UTC 2014
Modified Files: src/sys/arch/amd64/conf: GENERIC Removed Files: src/sys/arch/amd64/conf: DRMKMS NO_DRM Log Message: make DRMKMS the default on GENERIC and comment out the legacy drivers. To generate a diff of this commit: cvs rdiff -u -r1.8 -r0 src/sys/arch/amd64/conf/DRMKMS cvs rdiff -u -r1.401 -r1.402 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.2 -r0 src/sys/arch/amd64/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/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.401 src/sys/arch/amd64/conf/GENERIC:1.402 --- src/sys/arch/amd64/conf/GENERIC:1.401 Sun Oct 26 14:43:18 2014 +++ src/sys/arch/amd64/conf/GENERIC Sun Nov 2 18:08:40 2014 @@ -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 @@ include "arch/amd64/conf/std.amd64" 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 @@ 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 + +# 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