make DRMKMS the default on GENERIC and comment out the legacy drivers.

This commit is contained in:
christos 2014-11-02 23:08:40 +00:00
parent b9047e0aa0
commit ceab229958
3 changed files with 22 additions and 43 deletions

View File

@ -1,20 +0,0 @@
include "arch/amd64/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
#options ACPIVERBOSE # verbose ACPI device autoconfig messages
options PCIVERBOSE # verbose PCI device autoconfig messages
options USBVERBOSE # verbose USB device autoconfig messages

View File

@ -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

View File

@ -1,11 +0,0 @@
include "arch/amd64/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?