summaryrefslogtreecommitdiff
path: root/sys/arch/amd64/conf/files.amd64
diff options
context:
space:
mode:
authorOwain Ainsworth <oga@cvs.openbsd.org>2008-11-09 15:11:20 +0000
committerOwain Ainsworth <oga@cvs.openbsd.org>2008-11-09 15:11:20 +0000
commitc82365de6d1669d3aa8f37a7f91c598524aba316 (patch)
treeb47841f2a3a7541cc4236df1638f5f4433c8f81e /sys/arch/amd64/conf/files.amd64
parent19e72e3b9f3138440f80b79260f2adaee85eae40 (diff)
Rework that way that agp attaches.
previously, we had a static list of pcidevs and which agp driver would be interanlly attached. Instead, split the agp drivers so they work like audio(4), where we attach a driver, which sets up some callbacks and initial state, then attaches the interface (agp(4)). Since this allows us to attach different drivers in different places, and give them /proper/ probe functions move most of the drivers back to attaching at pchb, where they should, and intagp (formerly agp_i810) stays attaching at vga, since it's part of the intel integrated graphics chips. Diff shrinks the kernel slightly, gets rid of the annoying "no integrated graphics" warning, and allows more cleanup later. Tested by many. fix for alpha build (the only other vga_pci.c consumer) suggested by miod.
Diffstat (limited to 'sys/arch/amd64/conf/files.amd64')
-rw-r--r--sys/arch/amd64/conf/files.amd6413
1 files changed, 6 insertions, 7 deletions
diff --git a/sys/arch/amd64/conf/files.amd64 b/sys/arch/amd64/conf/files.amd64
index 35bc57acdbe..7ce88984879 100644
--- a/sys/arch/amd64/conf/files.amd64
+++ b/sys/arch/amd64/conf/files.amd64
@@ -1,4 +1,4 @@
-# $OpenBSD: files.amd64,v 1.40 2008/06/11 09:22:39 phessler Exp $
+# $OpenBSD: files.amd64,v 1.41 2008/11/09 15:11:19 oga Exp $
maxpartitions 16
maxusers 2 16 128
@@ -104,16 +104,15 @@ file arch/amd64/pci/pciide_machdep.c pciide
include "dev/puc/files.puc"
-# 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
+device pchb: pcibus, agpbus
attach pchb at pci
file arch/amd64/pci/pchb.c pchb
+# AGP bridge support. most attach at pchb
+include "dev/pci/files.agp"
+file arch/amd64/pci/agp_machdep.c agp
+
#
# CARDBUS
#