Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove vga@isa and pcdisplay@isa from i386 GENERIC, and create a new 

LEGACY kernel that includes them instead.  now radeon@pci is able to
properly claim wsdisplay0 on i386 systems, and radeondrmkms has a good
chance of working.

this "fixes" PR#49290.
This commit is contained in:
mrg 2015-03-07 07:28:37 +00:00
parent 069781851d
commit 820bac9951
4 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
distrib/notes/i386/contents
View File

@ -1,4 +1,4 @@
.\" $NetBSD: contents,v 1.27 2012/08/17 20:10:53 riz Exp $
.\" $NetBSD: contents,v 1.28 2015/03/07 07:28:37 mrg Exp $
.\"
.\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc.
.\" All rights reserved.
@ -70,6 +70,10 @@ The monolithic kernel which doesn't use kernel modules.
.
The installation kernel.
.
. It Pa netbsd-LEGACY.gz
.
The kernel containing support for ISA (VGA and PC Display) display devices.
.
. It Pa netbsd-INSTALL_XEN3PAE_DOMU.gz
. It Pa netbsd-INSTALL_XEN3_DOMU.gz
. It Pa netbsd-XEN3PAE_DOMU.gz

3
etc/etc.i386/Makefile.inc
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.67 2012/07/04 13:54:20 reinoud Exp $
# $NetBSD: Makefile.inc,v 1.68 2015/03/07 07:28:37 mrg Exp $
#
# etc.i386/Makefile.inc -- i386-specific etc Makefile targets
#
@ -8,6 +8,7 @@
KERNEL_SETS= GENERIC
KERNEL_SETS+= MONOLITHIC
KERNEL_SETS+= LEGACY
KERNEL_SETS+= XEN3_DOM0
KERNEL_SETS+= XEN3_DOMU
KERNEL_SETS+= XEN3PAE_DOM0

11
sys/arch/i386/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.1119 2015/02/13 18:57:47 nonaka Exp $
# $NetBSD: GENERIC,v 1.1120 2015/03/07 07:28:37 mrg 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.1119 $"
#ident "GENERIC-$Revision: 1.1120 $"
maxusers 64 # estimated number of users
@ -537,14 +537,15 @@ pms* at pckbc? # PS/2 mouse for wsmouse
#options PMS_DISABLE_POWERHOOK # Disable PS/2 reset on resume
options PMS_SYNAPTICS_TOUCHPAD # Enable support for Synaptics Touchpads
options PMS_ELANTECH_TOUCHPAD # Enable support for Elantech Touchpads
vga0 at isa?
# vga@isa and pcdisplay@isa are disabled; see PR#49290
#vga0 at isa?
vga* at pci? dev ? function ?
pcdisplay0 at isa? # CGA, MDA, EGA, HGA
#pcdisplay0 at isa? # CGA, MDA, EGA, HGA
genfb* at pci? dev ? function ?
options VCONS_DRAW_INTR
#machfb* at pci? dev ? function ? # ATI Mach64 framebuffer driver
wsdisplay* at vga? console ?
wsdisplay* at pcdisplay? console ?
#wsdisplay* at pcdisplay? console ?
wsdisplay* at wsemuldisplaydev?
#wsdisplay* at machfb? console ?
wskbd* at pckbd? console ?

14
sys/arch/i386/conf/LEGACY Normal file
View File

@ -0,0 +1,14 @@
# $NetBSD: LEGACY,v 1.1 2015/03/07 07:28:37 mrg Exp $
# LEGACY kernel -- includes vga@isa and pcdisplay@isa for pre-PCI
# systems, due to significant pain making them fail to attach when
# drmkms has not already attached. see PR#49290 for details.
include "arch/i386/conf/GENERIC"
vga0 at isa?
pcdisplay0 at isa? # CGA, MDA, EGA, HGA
wsdisplay* at pcdisplay? console ?
# XXX we could turn off all sorts of other modern features in this
# configuration, but that is left for future work.