From ceab2299585e1fecf147ddd2c32c5aabb1f92ecc Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Sun, 2 Nov 2014 23:08:40 +0000
Subject: [PATCH] make DRMKMS the default on GENERIC and comment out the legacy
 drivers.

---
 sys/arch/amd64/conf/DRMKMS  | 20 --------------------
 sys/arch/amd64/conf/GENERIC | 34 ++++++++++++++++++++++------------
 sys/arch/amd64/conf/NO_DRM  | 11 -----------
 3 files changed, 22 insertions(+), 43 deletions(-)
 delete mode 100644 sys/arch/amd64/conf/DRMKMS
 delete mode 100644 sys/arch/amd64/conf/NO_DRM

diff --git a/sys/arch/amd64/conf/DRMKMS b/sys/arch/amd64/conf/DRMKMS
deleted file mode 100644
index 0c9a3762b85f..000000000000
--- a/sys/arch/amd64/conf/DRMKMS
+++ /dev/null
@@ -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
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 96f6b4cf5973..c5613c908f6c 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -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
 
diff --git a/sys/arch/amd64/conf/NO_DRM b/sys/arch/amd64/conf/NO_DRM
deleted file mode 100644
index a610e6e7b11f..000000000000
--- a/sys/arch/amd64/conf/NO_DRM
+++ /dev/null
@@ -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?