From 5bcf484019a979de1576a010ed3e5cb6448a2a32 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Tue, 20 Dec 2005 20:05:21 +0000 Subject: [PATCH] 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 --- sys/dev/agp/agp.c | 4 +--- sys/dev/agp/agpvar.h | 1 - sys/pci/agp.c | 4 +--- sys/pci/agpvar.h | 1 - 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/sys/dev/agp/agp.c b/sys/dev/agp/agp.c index b44cfc94a31..ac9014f6c28 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 0869c26d2b8..df3112b49d2 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; diff --git a/sys/pci/agp.c b/sys/pci/agp.c index b44cfc94a31..ac9014f6c28 100644 --- a/sys/pci/agp.c +++ b/sys/pci/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/pci/agpvar.h b/sys/pci/agpvar.h index 0869c26d2b8..df3112b49d2 100644 --- a/sys/pci/agpvar.h +++ b/sys/pci/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;