diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2001-06-17 21:11:13 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2001-06-17 21:11:13 +0000 |
| commit | f56269aab7eaac45df2d374198a66ea160db3c8f (patch) | |
| tree | fe1509a40e41a35a382ae31a41698b23f5e6f5a4 /sys/arch/i386 | |
| parent | af6ffbfb320eca34e3f90188b63acc905b032258 (diff) | |
Don't pciaddr_do_resource_allocate if device is AGP to avoid conflict.
from Masanori Kanaoka <kanaoka@netbsd.org>
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/pci/pci_addr_fixup.c | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/sys/arch/i386/pci/pci_addr_fixup.c b/sys/arch/i386/pci/pci_addr_fixup.c index e0ee513f97f..a6f58407f91 100644 --- a/sys/arch/i386/pci/pci_addr_fixup.c +++ b/sys/arch/i386/pci/pci_addr_fixup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_addr_fixup.c,v 1.9 2001/03/15 03:55:19 mickey Exp $ */ +/* $OpenBSD: pci_addr_fixup.c,v 1.10 2001/06/17 21:11:12 mickey Exp $ */ /* $NetBSD: pci_addr_fixup.c,v 1.7 2000/08/03 20:10:45 nathanw Exp $ */ /*- @@ -60,6 +60,8 @@ int pciaddr_do_resource_allocate __P((struct pcibios_softc *, bus_addr_t pciaddr_ioaddr __P((u_int32_t)); void pciaddr_print_devid __P((pci_chipset_tag_t, pcitag_t)); +int pciaddr_device_is_agp __P((pci_chipset_tag_t, pcitag_t)); + #define PCIADDR_MEM_START 0x0 #define PCIADDR_MEM_END 0xffffffff #define PCIADDR_PORT_START 0x0 @@ -278,6 +280,10 @@ pciaddr_do_resource_allocate(sc, pc, tag, mapreg, ex, type, addr, size) if (*addr) /* no need to allocate */ return (0); + + /* XXX Don't allocate if device is AGP device to avoid conflict. */ + if (pciaddr_device_is_agp(pc, tag)) + return (0); start = (type == PCI_MAPREG_TYPE_MEM ? sc->mem_alloc_start : sc->port_alloc_start); @@ -360,6 +366,33 @@ pciaddr_print_devid(pc, tag) PCI_VENDOR(id), PCI_PRODUCT(id)); } +int +pciaddr_device_is_agp(pc, tag) + pci_chipset_tag_t pc; + pcitag_t tag; +{ + pcireg_t class, status, rval; + int off; + + /* Check AGP device. */ + class = pci_conf_read(pc, tag, PCI_CLASS_REG); + if (PCI_CLASS(class) == PCI_CLASS_DISPLAY) { + status = pci_conf_read(pc, tag, PCI_COMMAND_STATUS_REG); + if (status & PCI_STATUS_CAPLIST_SUPPORT) { + rval = pci_conf_read(pc, tag, PCI_CAPLISTPTR_REG); + for (off = PCI_CAPLIST_PTR(rval); + off != 0; + off = PCI_CAPLIST_NEXT(rval) ) { + rval = pci_conf_read(pc, tag, off); + if (PCI_CAPLIST_CAP(rval) == PCI_CAP_AGP) + return (1); + } + } + } + return (0); +} + + struct extent * pciaddr_search(mem_port, startp, size) int mem_port; |