diff options
| author | Jeff Hartmann <jhartmann@valinux.com> | 2001-08-13 23:23:47 +0000 |
|---|---|---|
| committer | Jeff Hartmann <jhartmann@valinux.com> | 2001-08-13 23:23:47 +0000 |
| commit | aa09e3611490d6a2f12f211c3c834f1237126313 (patch) | |
| tree | 0938669d60d1697e119ed218f276aaa38830e29e /linux-core/ati_pcigart.c | |
| parent | 2d4b2cf6f69de2ceaf0c2b00ccbb24aad412b202 (diff) | |
Sync with Linus 2.4.9-pre2 + make all nopage routines more alike
Diffstat (limited to 'linux-core/ati_pcigart.c')
| -rw-r--r-- | linux-core/ati_pcigart.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux-core/ati_pcigart.c b/linux-core/ati_pcigart.c index 99d17ee7..a794b3e0 100644 --- a/linux-core/ati_pcigart.c +++ b/linux-core/ati_pcigart.c @@ -133,9 +133,9 @@ int DRM(ati_pcigart_init)( drm_device_t *dev, #if defined(__alpha__) && (LINUX_VERSION_CODE >= 0x020400) /* we need to support large memory configurations */ entry->busaddr[i] = pci_map_single(dev->pdev, - entry->pagelist[i]->virtual, - PAGE_SIZE, - PCI_DMA_TODEVICE); + page_address( entry->pagelist[i] ), + PAGE_SIZE, + PCI_DMA_TODEVICE); if (entry->busaddr[i] == 0) { DRM_ERROR( "unable to map PCIGART pages!\n" ); DRM(ati_pcigart_cleanup)( dev, address, bus_address ); @@ -145,7 +145,7 @@ int DRM(ati_pcigart_init)( drm_device_t *dev, } page_base = (u32) entry->busaddr[i]; #else - page_base = virt_to_bus( entry->pagelist[i]->virtual ); + page_base = page_to_bus( entry->pagelist[i] ); #endif for (j = 0; j < (PAGE_SIZE / ATI_PCIGART_PAGE_SIZE); j++) { *pci_gart++ = cpu_to_le32( page_base ); |