Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-7]: src Apply patch (requested by christos in ticket #542):
details: https://anonhg.NetBSD.org/src/rev/22c396fe4a5f
branches: netbsd-7
changeset: 799095:22c396fe4a5f
user: snj <snj%NetBSD.org@localhost>
date: Wed Mar 18 03:57:15 2015 +0000
description:
Apply patch (requested by christos in ticket #542):
- Enable intel and radeon DRM/KMS drivers in GENERIC
- Disable all of the old DRM drivers in GENERIC
- Remove the separate DRMKMS kernel
diffstat:
etc/etc.amd64/Makefile.inc | 3 +-
etc/etc.i386/Makefile.inc | 3 +-
sys/arch/amd64/conf/ALL | 37 ++++++++++++++++++++++-------------
sys/arch/amd64/conf/DRMKMS | 20 -------------------
sys/arch/amd64/conf/GENERIC | 32 ++++++++++++++++++++----------
sys/arch/amd64/conf/INSTALL | 16 +++++---------
sys/arch/amd64/conf/NO_DRM | 10 ---------
sys/arch/i386/conf/ALL | 36 +++++++++++++++++++++-------------
sys/arch/i386/conf/DRMKMS | 16 ---------------
sys/arch/i386/conf/GENERIC | 31 +++++++++++++++++++----------
sys/arch/i386/conf/INSTALL | 17 +++++----------
sys/arch/i386/conf/NO_DRM | 10 ---------
usr.sbin/sysinst/arch/amd64/md.h | 4 +--
usr.sbin/sysinst/arch/i386/md.h | 4 +--
usr.sbin/sysinst/arch/i386/msg.md.de | 3 +-
usr.sbin/sysinst/arch/i386/msg.md.en | 3 +-
usr.sbin/sysinst/arch/i386/msg.md.es | 3 +-
usr.sbin/sysinst/arch/i386/msg.md.fr | 3 +-
usr.sbin/sysinst/arch/i386/msg.md.pl | 3 +-
19 files changed, 107 insertions(+), 147 deletions(-)
diffs (truncated from 521 to 300 lines):
diff -r 3b8be0e7d021 -r 22c396fe4a5f etc/etc.amd64/Makefile.inc
--- a/etc/etc.amd64/Makefile.inc Tue Mar 17 19:00:42 2015 +0000
+++ b/etc/etc.amd64/Makefile.inc Wed Mar 18 03:57:15 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.14.12.2 2015/02/27 09:23:02 martin Exp $
+# $NetBSD: Makefile.inc,v 1.14.12.3 2015/03/18 03:57:15 snj Exp $
#
# etc.amd64/Makefile.inc -- amd64-specific etc Makefile targets
#
@@ -8,7 +8,6 @@
KERNEL_SETS= GENERIC
KERNEL_SETS+= XEN3_DOM0 XEN3_DOMU
-KERNEL_SETS+= DRMKMS
# KERNEL_SETS+= GENERIC_USERMODE
BUILD_KERNELS= INSTALL INSTALL_XEN3_DOMU
diff -r 3b8be0e7d021 -r 22c396fe4a5f etc/etc.i386/Makefile.inc
--- a/etc/etc.i386/Makefile.inc Tue Mar 17 19:00:42 2015 +0000
+++ b/etc/etc.i386/Makefile.inc Wed Mar 18 03:57:15 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.67.12.2 2015/03/09 09:06:04 snj Exp $
+# $NetBSD: Makefile.inc,v 1.67.12.3 2015/03/18 03:57:15 snj Exp $
#
# etc.i386/Makefile.inc -- i386-specific etc Makefile targets
#
@@ -8,7 +8,6 @@
KERNEL_SETS= GENERIC
KERNEL_SETS+= MONOLITHIC
-KERNEL_SETS+= DRMKMS
KERNEL_SETS+= LEGACY
KERNEL_SETS+= XEN3_DOM0
KERNEL_SETS+= XEN3_DOMU
diff -r 3b8be0e7d021 -r 22c396fe4a5f sys/arch/amd64/conf/ALL
--- a/sys/arch/amd64/conf/ALL Tue Mar 17 19:00:42 2015 +0000
+++ b/sys/arch/amd64/conf/ALL Wed Mar 18 03:57:15 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.13.2.1 2014/11/18 19:05:28 snj Exp $
+# $NetBSD: ALL,v 1.13.2.2 2015/03/18 03:57:15 snj Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.13.2.1 $"
+#ident "ALL-$Revision: 1.13.2.2 $"
maxusers 64 # estimated number of users
@@ -509,17 +509,27 @@
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?
@@ -2035,7 +2045,6 @@
options NOT_DEBUG
options NSIODEBUG
options NTFS_DEBUG
-options NV_DEBUG
options OBOE_DEBUG
options OFW_DEBUG
options OHCI_DEBUG
diff -r 3b8be0e7d021 -r 22c396fe4a5f sys/arch/amd64/conf/DRMKMS
--- a/sys/arch/amd64/conf/DRMKMS Tue Mar 17 19:00:42 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 3b8be0e7d021 -r 22c396fe4a5f sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC Tue Mar 17 19:00:42 2015 +0000
+++ b/sys/arch/amd64/conf/GENERIC Wed Mar 18 03:57:15 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.392.2.5 2015/01/20 20:40:50 martin Exp $
+# $NetBSD: GENERIC,v 1.392.2.6 2015/03/18 03:57:15 snj Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.392.2.5 $"
+#ident "GENERIC-$Revision: 1.392.2.6 $"
maxusers 64 # estimated number of users
@@ -383,16 +383,26 @@
pcppi0 at isa?
sysbeep0 at pcppi?
-# DRI 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
+#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 -r 3b8be0e7d021 -r 22c396fe4a5f sys/arch/amd64/conf/INSTALL
--- a/sys/arch/amd64/conf/INSTALL Tue Mar 17 19:00:42 2015 +0000
+++ b/sys/arch/amd64/conf/INSTALL Wed Mar 18 03:57:15 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.89.8.1 2015/01/23 09:01:45 martin Exp $
+# $NetBSD: INSTALL,v 1.89.8.2 2015/03/18 03:57:15 snj 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.8.1 $"
+#ident "INSTALL-$Revision: 1.89.8.2 $"
no options MEMORY_DISK_DYNAMIC
options MEMORY_DISK_IS_ROOT # force root on memory disk
@@ -16,11 +16,7 @@
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 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?
diff -r 3b8be0e7d021 -r 22c396fe4a5f sys/arch/amd64/conf/NO_DRM
--- a/sys/arch/amd64/conf/NO_DRM Tue Mar 17 19:00:42 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-include "arch/amd64/conf/GENERIC"
-
-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?
diff -r 3b8be0e7d021 -r 22c396fe4a5f sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL Tue Mar 17 19:00:42 2015 +0000
+++ b/sys/arch/i386/conf/ALL Wed Mar 18 03:57:15 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.380.2.1 2014/11/18 19:05:30 snj Exp $
+# $NetBSD: ALL,v 1.380.2.2 2015/03/18 03:57:15 snj Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.380.2.1 $"
+#ident "ALL-$Revision: 1.380.2.2 $"
maxusers 64 # estimated number of users
@@ -588,17 +588,26 @@
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?
@@ -2236,7 +2245,6 @@
options NOT_DEBUG
options NSIODEBUG
options NTFS_DEBUG
-options NV_DEBUG
options OBOE_DEBUG
options OFW_DEBUG
options OHCI_DEBUG
diff -r 3b8be0e7d021 -r 22c396fe4a5f sys/arch/i386/conf/DRMKMS
--- a/sys/arch/i386/conf/DRMKMS Tue Mar 17 19:00:42 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-include "arch/i386/conf/NO_DRM"
-
-i915drmkms* at pci? dev ? function ?
-intelfb* at intelfbbus?
-
-radeon* at pci? dev ? function ?
-radeondrmkmsfb* at radeonfbbus?
Home |
Main Index |
Thread Index |
Old Index