upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-09 08:43:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't map the AGP aperture into contiguous KVA. The various graphics

Browse source 
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
This commit is contained in:
John Baldwin 2005-12-20 20:05:21 +00:00
parent 4c2546c1a9
commit 5bcf484019
4 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sys/dev/agp/agp.c
View file

@ -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;
}

1
sys/dev/agp/agpvar.h
View file

@ -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;

4
sys/pci/agp.c
View file

@ -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;
}

1
sys/pci/agpvar.h
View file

@ -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;