diff options
author | jhb <jhb@FreeBSD.org> | 2005-12-20 20:05:21 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2005-12-20 20:05:21 +0000 |
commit | 9f22e2f35e36371aa72e2704a4470469c0e9cfff (patch) | |
tree | 4732818d1dc35b064f7906d22ad25fa18e686fe6 /sys/dev/agp | |
parent | 91b174b0da95c762353dbba849743ffef9db133a (diff) | |
download | FreeBSD-src-9f22e2f35e36371aa72e2704a4470469c0e9cfff.zip FreeBSD-src-9f22e2f35e36371aa72e2704a4470469c0e9cfff.tar.gz |
Don't map the AGP aperture into contiguous KVA. The various graphics
drivers already map sections into KVA as needed anyway. Note that this
will probably break the nvidia driver, but I will coordinate to get that
fixed.
MFC after: 2 weeks
Diffstat (limited to 'sys/dev/agp')
-rw-r--r-- | sys/dev/agp/agp.c | 4 | ||||
-rw-r--r-- | sys/dev/agp/agpvar.h | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/sys/dev/agp/agp.c b/sys/dev/agp/agp.c index b44cfc9..ac9014f 100644 --- a/sys/dev/agp/agp.c +++ b/sys/dev/agp/agp.c @@ -209,8 +209,7 @@ agp_generic_attach(device_t dev) * Find and map the aperture. */ rid = AGP_APBASE; - sc->as_aperture = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, - RF_ACTIVE); + sc->as_aperture = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, 0); if (!sc->as_aperture) return ENOMEM; @@ -852,7 +851,6 @@ agp_get_info(device_t dev, struct agp_info *info) pci_read_config(dev, agp_find_caps(dev) + AGP_STATUS, 4); info->ai_aperture_base = rman_get_start(sc->as_aperture); info->ai_aperture_size = rman_get_size(sc->as_aperture); - info->ai_aperture_va = (vm_offset_t) rman_get_virtual(sc->as_aperture); info->ai_memory_allowed = sc->as_maxmem; info->ai_memory_used = sc->as_allocated; } diff --git a/sys/dev/agp/agpvar.h b/sys/dev/agp/agpvar.h index 0869c26..df3112b 100644 --- a/sys/dev/agp/agpvar.h +++ b/sys/dev/agp/agpvar.h @@ -47,7 +47,6 @@ struct agp_info { u_int32_t ai_mode; vm_offset_t ai_aperture_base; vm_size_t ai_aperture_size; - vm_offset_t ai_aperture_va; vm_size_t ai_memory_allowed; vm_size_t ai_memory_used; u_int32_t ai_devid; |