diff options
| author | Eric Anholt <anholt@freebsd.org> | 2005-11-08 02:38:01 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2005-11-08 02:38:01 +0000 |
| commit | 1a256df4804e4e987f81226a5d8e0573363607ee (patch) | |
| tree | 31749f8042cfdd36260f195fb3af65c7bab46e51 /shared-core/r128_cce.c | |
| parent | 145b23b55220bdfc6639d3279ad96310faa650a3 (diff) | |
Catch FreeBSD up to the pcie gart changes. Required minor modification to
radeon_cp.c to use a drm_local_map_t-type mapping (drm_core_ioremap
rather than drm_ioremap), which contains private device mapping
information on BSD. I also changed the ati_pcigart interface to use
"void *" for pointers to kva rather than "unsigned long". While PCIGART
support appears to be broken on FreeBSD currently, I think this is not
new, and BusType PCI remains working on my r100 in Linux.
Diffstat (limited to 'shared-core/r128_cce.c')
| -rw-r--r-- | shared-core/r128_cce.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/shared-core/r128_cce.c b/shared-core/r128_cce.c index cb84fa84..06880e0b 100644 --- a/shared-core/r128_cce.c +++ b/shared-core/r128_cce.c @@ -559,7 +559,8 @@ static int r128_do_init_cce(drm_device_t * dev, drm_r128_init_t * init) if (dev_priv->is_pci) { #endif dev_priv->gart_info.gart_table_location = DRM_ATI_GART_MAIN; - dev_priv->gart_info.addr = dev_priv->gart_info.bus_addr = 0; + dev_priv->gart_info.addr = NULL; + dev_priv->gart_info.bus_addr = 0; dev_priv->gart_info.is_pcie = 0; if (!drm_ati_pcigart_init(dev, &dev_priv->gart_info)) { DRM_ERROR("failed to init PCI GART!\n"); |