summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoroga <oga@openbsd.org>2007-12-09 00:09:22 +0000
committeroga <oga@openbsd.org>2007-12-09 00:09:22 +0000
commit07d06b1503477ae327b1b06cf0f26fdc38193081 (patch)
tree7339b532ca678fe6bde431b3c07fb53779c21c67
parentin raldetach, do not call chip-specific detach if it was never called in (diff)
downloadwireguard-openbsd-07d06b1503477ae327b1b06cf0f26fdc38193081.tar.xz
wireguard-openbsd-07d06b1503477ae327b1b06cf0f26fdc38193081.zip
sturm@ let me know that the workaround in here breaks things on bge somehow.
Revert it for now.
-rw-r--r--sys/dev/pci/agp_i810.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/sys/dev/pci/agp_i810.c b/sys/dev/pci/agp_i810.c
index b70f1240bdf..730ea07e94f 100644
--- a/sys/dev/pci/agp_i810.c
+++ b/sys/dev/pci/agp_i810.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: agp_i810.c,v 1.26 2007/12/07 17:35:22 oga Exp $ */
+/* $OpenBSD: agp_i810.c,v 1.27 2007/12/09 00:09:22 oga Exp $ */
/* $NetBSD: agp_i810.c,v 1.15 2003/01/31 00:07:39 thorpej Exp $ */
/*-
@@ -152,7 +152,6 @@ agp_i810_attach(struct agp_softc *sc, struct pci_attach_args *pa)
struct agp_i810_softc *isc;
struct agp_gatt *gatt;
bus_addr_t mmaddr, gmaddr;
- bus_size_t mmaddrsize;
int error;
u_int memtype = 0;
@@ -240,8 +239,6 @@ agp_i810_attach(struct agp_softc *sc, struct pci_attach_args *pa)
return (error);
}
- pci_mapreg_info(isc->vga_pa.pa_pc, isc->vga_pa.pa_tag,
- mmaddr, memtype, NULL, &mmaddrsize, NULL);
error = pci_mapreg_map(&isc->vga_pa, mmaddr, memtype, 0,
&isc->bst, &isc->bsh, NULL, &isc->bsz, 0);
if (error != 0) {
@@ -427,12 +424,6 @@ agp_i810_attach(struct agp_softc *sc, struct pci_attach_args *pa)
*/
agp_flush_cache();
- /*
- * another device (the drm) may need to access this area.
- * we don't need to access it again so unmap.
- */
- bus_space_unmap(isc->bst, isc->bsh, mmaddrsize);
-
return (0);
}