diff options
| author | Owain Ainsworth <oga@cvs.openbsd.org> | 2008-03-16 19:00:29 +0000 |
|---|---|---|
| committer | Owain Ainsworth <oga@cvs.openbsd.org> | 2008-03-16 19:00:29 +0000 |
| commit | c5322cc7f26f297d89d5739341558d77a823ca0a (patch) | |
| tree | 89262368ac92e725ff85a9bd6201003c7e69d4c7 /sys/arch/i386/conf | |
| parent | 68d85f5a89fb982d3c281c6c189cd217dc0d9ae0 (diff) | |
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@.
Diffstat (limited to 'sys/arch/i386/conf')
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 5 | ||||
| -rw-r--r-- | sys/arch/i386/conf/files.i386 | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 4ff07e85eef..68672b403c6 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.603 2008/02/25 23:16:47 brad Exp $ +# $OpenBSD: GENERIC,v 1.604 2008/03/16 19:00:28 oga Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -85,7 +85,6 @@ gpio* at gscpcib? glxpcib* at pci? # AMD CS5536 PCI-ISA bridge gpio* at glxpcib? -agp* at pchb? # AGP bridges # power management and other environmental stuff elansc* at pci? # AMD Elan SC520 System Controller gpio* at elansc? @@ -318,6 +317,8 @@ wskbd* at pckbd? mux 1 wsmouse* at pms? mux 0 wsmouse* at pmsi? mux 0 +agp* at vga? # AGP bridges + #vesabios0 at mainbus? # option VESABIOSVERBOSE diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386 index d7ef2e18a9e..669df8ef1f5 100644 --- a/sys/arch/i386/conf/files.i386 +++ b/sys/arch/i386/conf/files.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: files.i386,v 1.172 2008/03/04 21:14:29 oga Exp $ +# $OpenBSD: files.i386,v 1.173 2008/03/16 19:00:28 oga Exp $ # # new style config file for i386 architecture # @@ -96,12 +96,15 @@ file arch/i386/i386/mainbus.c mainbus # include "../../../dev/pci/files.pci" -include "../../../dev/pci/files.agp" file arch/i386/pci/pci_machdep.c pci -file arch/i386/pci/agp_machdep.c agp file arch/i386/pci/pciide_machdep.c pciide file arch/i386/pci/pcic_pci_machdep.c pcic_pci +# AGP devices +device agp: agp_ali, agp_amd, agp_i810, agp_intel, agp_sis, agp_via +attach agp at agpbus +file arch/i386/pci/agp_machdep.c agp + # PCI-Host bridge chipsets device pchb: pcibus, agpbus, agp_amd, agp_i810, agp_intel, agp_sis, agp_via |