Module Name: src
Committed By: snj
Date: Mon Mar 9 09:06:04 UTC 2015
Modified Files:
src/distrib/notes/i386 [netbsd-7]: contents
src/etc/etc.i386 [netbsd-7]: Makefile.inc
src/sys/arch/i386/conf [netbsd-7]: GENERIC
Added Files:
src/sys/arch/i386/conf [netbsd-7]: LEGACY
Log Message:
Pull up following revision(s) (requested by mrg in ticket #578):
distrib/notes/i386/contents: revision 1.28
etc/etc.i386/Makefile.inc: revision 1.68
sys/arch/i386/conf/GENERIC: revision 1.1120
sys/arch/i386/conf/LEGACY: revision 1.1
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.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.27.12.1 src/distrib/notes/i386/contents
cvs rdiff -u -r1.67.12.1 -r1.67.12.2 src/etc/etc.i386/Makefile.inc
cvs rdiff -u -r1.1107.2.4 -r1.1107.2.5 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r0 -r1.1.2.2 src/sys/arch/i386/conf/LEGACY
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/i386/contents
diff -u src/distrib/notes/i386/contents:1.27 src/distrib/notes/i386/contents:1.27.12.1
--- src/distrib/notes/i386/contents:1.27 Fri Aug 17 20:10:53 2012
+++ src/distrib/notes/i386/contents Mon Mar 9 09:06:03 2015
@@ -1,4 +1,4 @@
-.\" $NetBSD: contents,v 1.27 2012/08/17 20:10:53 riz Exp $
+.\" $NetBSD: contents,v 1.27.12.1 2015/03/09 09:06:03 snj Exp $
.\"
.\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -70,6 +70,10 @@ The monolithic kernel which doesn't use
.
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
Index: src/etc/etc.i386/Makefile.inc
diff -u src/etc/etc.i386/Makefile.inc:1.67.12.1 src/etc/etc.i386/Makefile.inc:1.67.12.2
--- src/etc/etc.i386/Makefile.inc:1.67.12.1 Thu Dec 4 19:18:09 2014
+++ src/etc/etc.i386/Makefile.inc Mon Mar 9 09:06:04 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.67.12.1 2014/12/04 19:18:09 snj Exp $
+# $NetBSD: Makefile.inc,v 1.67.12.2 2015/03/09 09:06:04 snj Exp $
#
# etc.i386/Makefile.inc -- i386-specific etc Makefile targets
#
@@ -9,6 +9,7 @@
KERNEL_SETS= GENERIC
KERNEL_SETS+= MONOLITHIC
KERNEL_SETS+= DRMKMS
+KERNEL_SETS+= LEGACY
KERNEL_SETS+= XEN3_DOM0
KERNEL_SETS+= XEN3_DOMU
KERNEL_SETS+= XEN3PAE_DOM0
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1107.2.4 src/sys/arch/i386/conf/GENERIC:1.1107.2.5
--- src/sys/arch/i386/conf/GENERIC:1.1107.2.4 Tue Jan 20 20:40:50 2015
+++ src/sys/arch/i386/conf/GENERIC Mon Mar 9 09:06:04 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1107.2.4 2015/01/20 20:40:50 martin Exp $
+# $NetBSD: GENERIC,v 1.1107.2.5 2015/03/09 09:06:04 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.4 $"
+#ident "GENERIC-$Revision: 1.1107.2.5 $"
maxusers 64 # estimated number of users
@@ -533,14 +533,15 @@ pms* at pckbc? # PS/2 mouse for wsmous
#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 ?
Added files:
Index: src/sys/arch/i386/conf/LEGACY
diff -u /dev/null src/sys/arch/i386/conf/LEGACY:1.1.2.2
--- /dev/null Mon Mar 9 09:06:04 2015
+++ src/sys/arch/i386/conf/LEGACY Mon Mar 9 09:06:04 2015
@@ -0,0 +1,14 @@
+# $NetBSD: LEGACY,v 1.1.2.2 2015/03/09 09:06:04 snj 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.
