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
This commit is contained in:
snj 2015-03-18 03:57:15 +00:00
parent 5a9b55626a
commit 4c78f16f3e
19 changed files with 107 additions and 147 deletions

View File

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

View File

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

View File

@ -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 @@ include "arch/amd64/conf/std.amd64"
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 @@ 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?
@ -2035,7 +2045,6 @@ options NOTDEF_DEBUG
options NOT_DEBUG
options NSIODEBUG
options NTFS_DEBUG
options NV_DEBUG
options OBOE_DEBUG
options OFW_DEBUG
options OHCI_DEBUG

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.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 @@ include "arch/amd64/conf/std.amd64"
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 @@ attimer0 at isa?
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

View File

@ -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_SERVER=0 # no userspace memory disk support
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?

View File

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

View File

@ -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 @@ include "arch/i386/conf/std.i386"
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 @@ 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
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 NOTDEF_DEBUG
options NOT_DEBUG
options NSIODEBUG
options NTFS_DEBUG
options NV_DEBUG
options OBOE_DEBUG
options OFW_DEBUG
options OHCI_DEBUG

View File

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

View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.1107.2.5 2015/03/09 09:06:04 snj Exp $
# $NetBSD: GENERIC,v 1.1107.2.6 2015/03/18 03:57:15 snj Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.1107.2.5 $"
#ident "GENERIC-$Revision: 1.1107.2.6 $"
maxusers 64 # estimated number of users
@ -555,16 +555,25 @@ attimer0 at isa?
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
i915drmkms* at pci? dev ? function ?
intelfb* at intelfbbus?
radeon* at pci? dev ? function ?
radeondrmkmsfb* at radeonfbbus?
#nouveau* at pci? dev ? function ?
#nouveaufb* at nouveaufbbus?
# Serial Devices

View File

@ -1,4 +1,4 @@
# $NetBSD: INSTALL,v 1.330.30.1 2015/01/23 09:01:44 martin Exp $
# $NetBSD: INSTALL,v 1.330.30.2 2015/03/18 03:57:15 snj Exp $
#
# INSTALL - Installation kernel.
#
@ -7,7 +7,7 @@
include "arch/i386/conf/MONOLITHIC"
#ident "INSTALL-$Revision: 1.330.30.1 $"
#ident "INSTALL-$Revision: 1.330.30.2 $"
no options MEMORY_DISK_DYNAMIC
options MEMORY_DISK_IS_ROOT # force root on memory disk
@ -15,12 +15,7 @@ options MEMORY_DISK_SERVER=0 # no userspace memory disk support
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
no viadrm* at drm? # VIA DRM driver
# DRMKMS driver
no i915drmkms* at pci?
no radeon* at pci?
#no nouveau* at pci?

View File

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

View File

@ -1,4 +1,4 @@
/* $NetBSD: md.h,v 1.1.4.1 2014/12/04 19:18:09 snj Exp $ */
/* $NetBSD: md.h,v 1.1.4.2 2015/03/18 03:57:16 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -80,10 +80,8 @@
* from floppy.
*/
#define SET_KERNEL_1_NAME "kern-GENERIC"
#define SET_KERNEL_2_NAME "kern-DRMKMS"
#define SET_KERNEL_GENERIC SET_KERNEL_1
#define SET_KERNEL_DRMKMS SET_KERNEL_2
/*
* Disk names accepted as valid targets for a from-scratch installation.

View File

@ -1,4 +1,4 @@
/* $NetBSD: md.h,v 1.1.4.1 2014/12/04 19:18:09 snj Exp $ */
/* $NetBSD: md.h,v 1.1.4.2 2015/03/18 03:57:16 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -75,10 +75,8 @@
*/
#define SET_KERNEL_GENERIC SET_KERNEL_1
#define SET_KERNEL_DRMKMS SET_KERNEL_2
#define SET_KERNEL_1_NAME "kern-GENERIC"
#define SET_KERNEL_2_NAME "kern-DRMKMS"
/*
* Disk names accepted as valid targets for a from-scratch installation.

View File

@ -1,4 +1,4 @@
/* $NetBSD: msg.md.de,v 1.1.4.1 2014/12/04 19:18:09 snj Exp $ */
/* $NetBSD: msg.md.de,v 1.1.4.2 2015/03/18 03:57:16 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -165,4 +165,3 @@ message updatembr
NetBSD Bootcodes updaten?}
message set_kernel_1 {Kernel (GENERIC)}
message set_kernel_2 {Kernel (DRMKMS)}

View File

@ -1,4 +1,4 @@
/* $NetBSD: msg.md.en,v 1.1.4.1 2014/12/04 19:18:09 snj Exp $ */
/* $NetBSD: msg.md.en,v 1.1.4.2 2015/03/18 03:57:16 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -161,4 +161,3 @@ message updatembr
the latest version of the NetBSD bootcode?}
message set_kernel_1 {Kernel (GENERIC)}
message set_kernel_2 {Kernel (DRMKMS)}

View File

@ -1,4 +1,4 @@
/* $NetBSD: msg.md.es,v 1.1.4.1 2014/12/04 19:18:09 snj Exp $ */
/* $NetBSD: msg.md.es,v 1.1.4.2 2015/03/18 03:57:16 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -162,4 +162,3 @@ message updatembr
Record a la ultima versión del código de arranque de NetBSD?}
message set_kernel_1 {Núcleo (GENERIC)}
message set_kernel_2 {Núcleo (DRMKMS)}

View File

@ -1,4 +1,4 @@
/* $NetBSD: msg.md.fr,v 1.1.4.1 2014/12/04 19:18:09 snj Exp $ */
/* $NetBSD: msg.md.fr,v 1.1.4.2 2015/03/18 03:57:16 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -157,4 +157,3 @@ message updatembr
avec la dernière version du code d'amorçage de NetBSD ?}
message set_kernel_1 {Kernel (GENERIC)}
message set_kernel_2 {Kernel (DRMKMS)}

View File

@ -1,4 +1,4 @@
/* $NetBSD: msg.md.pl,v 1.1.4.1 2014/12/04 19:18:09 snj Exp $ */
/* $NetBSD: msg.md.pl,v 1.1.4.2 2015/03/18 03:57:16 snj Exp $ */
/* Based on english version: */
/* NetBSD: msg.md.en,v 1.24 2001/01/27 07:34:39 jmc Exp */
@ -156,4 +156,3 @@ message updatembr
kodu rozruchowego NetBSD?}
message set_kernel_1 {Kernel (GENERIC)}
message set_kernel_2 {Kernel (DRMKMS)}