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/conf/files | |
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/conf/files')
-rw-r--r-- | sys/conf/files | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/conf/files b/sys/conf/files index 6cfc49eb7d8..c0b45aa724e 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1,4 +1,4 @@ -# $OpenBSD: files,v 1.424 2008/01/21 20:00:32 sobrado Exp $ +# $OpenBSD: files,v 1.425 2008/03/16 19:00:28 oga Exp $ # $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 @@ -93,12 +93,16 @@ file dev/ic/pcdisplay_chars.c pcdisplayops define mk48txx file dev/ic/mk48txx.c mk48txx +# AGP +define agpbus {} +include "dev/pci/files.agp" + # DRM - Direct Rendering Manager: /dev/drm define drm {} include "dev/pci/drm/files.drm" # VGA graphics -device vga: wsemuldisplaydev, pcdisplayops, drm +device vga: wsemuldisplaydev, pcdisplayops, drm, agpbus file dev/ic/vga.c vga & (vga_pci | vga_isa) needs-flag file dev/ic/vga_subr.c vga & (vga_pci | vga_isa) needs-flag |