Make agp(4) attach at vga(4) instead of pchb(4). This is because sometimes

agp and drm need to use the same memory mapping, the best way to deal
with that is to allow them to share (that's coming later), for this to
work cleanly we move the attach point of agp.

Ideally most agp drivers would attach at pchb, with only agp_i810
(and any that work similarly) attaching at vga, but this will do for
now.

ok kettenis@, miod@.

2 files changed, 7 insertions, 6 deletions

diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index d73dc574843..a3b2d0dfdf7 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.216 2008/02/25 23:16:47 brad Exp $
+#	$OpenBSD: GENERIC,v 1.217 2008/03/16 19:00:28 oga Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -64,7 +64,7 @@ pci*	at pchb?
 pcib*	at pci?			# PCI-ISA bridge
 amdpcib* at pci?		# AMD 8111 LPC bridge
 
-agp* 	at pchb?		# AGP bridge
+agp* 	at vga?			# AGP bridge
 
 # National Semiconductor LM7[89] and compatible hardware monitors
 lm0	at isa? port 0x290
diff --git a/sys/arch/amd64/conf/files.amd64 b/sys/arch/amd64/conf/files.amd64
index 12f7f9daf8b..7ee92539d4b 100644
--- a/sys/arch/amd64/conf/files.amd64
+++ b/sys/arch/amd64/conf/files.amd64
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.amd64,v 1.38 2007/11/26 23:50:03 art Exp $
+#	$OpenBSD: files.amd64,v 1.39 2008/03/16 19:00:28 oga Exp $
 
 maxpartitions 16
 maxusers 2 16 128
@@ -103,12 +103,13 @@ file	arch/amd64/pci/pciide_machdep.c		pciide
 
 include	"dev/puc/files.puc"
 
-# AGP
-include "dev/pci/files.agp"
+# AGP devices
+device	agp: agp_i810
+attach	agp at agpbus
 file	arch/amd64/pci/agp_machdep.c		agp
 
 # PCI Host bridge chipsets
-device	pchb: pcibus, agpbus, agp_i810
+device	pchb: pcibus
 attach	pchb at pci
 file	arch/amd64/pci/pchb.c			pchb