diff options
author | Dave Airlie <airlied@redhat.com> | 2008-06-18 21:27:23 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2008-06-18 21:27:23 -0400 |
commit | 7ec700fcaf4f01ae72956df74a9e0d08938fd26e (patch) | |
tree | 9ed0931cd35320af58d5fd256e1d4b1de165ec32 /drivers | |
parent | b554305905d9bc2184b424aa67712119d5c9fb99 (diff) |
drm: pcigart use proper pci map interfaces.
Switch to using more correct pci dma mapping interfaces.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/char/drm/ati_pcigart.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/char/drm/ati_pcigart.c b/drivers/char/drm/ati_pcigart.c index b710426bab3e..c533d0c9ec61 100644 --- a/drivers/char/drm/ati_pcigart.c +++ b/drivers/char/drm/ati_pcigart.c | |||
@@ -76,7 +76,7 @@ int drm_ati_pcigart_cleanup(struct drm_device *dev, struct drm_ati_pcigart_info | |||
76 | for (i = 0; i < pages; i++) { | 76 | for (i = 0; i < pages; i++) { |
77 | if (!entry->busaddr[i]) | 77 | if (!entry->busaddr[i]) |
78 | break; | 78 | break; |
79 | pci_unmap_single(dev->pdev, entry->busaddr[i], | 79 | pci_unmap_page(dev->pdev, entry->busaddr[i], |
80 | PAGE_SIZE, PCI_DMA_TODEVICE); | 80 | PAGE_SIZE, PCI_DMA_TODEVICE); |
81 | } | 81 | } |
82 | 82 | ||
@@ -137,10 +137,8 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga | |||
137 | 137 | ||
138 | for (i = 0; i < pages; i++) { | 138 | for (i = 0; i < pages; i++) { |
139 | /* we need to support large memory configurations */ | 139 | /* we need to support large memory configurations */ |
140 | entry->busaddr[i] = pci_map_single(dev->pdev, | 140 | entry->busaddr[i] = pci_map_page(dev->pdev, entry->pagelist[i], |
141 | page_address(entry-> | 141 | 0, PAGE_SIZE, PCI_DMA_TODEVICE); |
142 | pagelist[i]), | ||
143 | PAGE_SIZE, PCI_DMA_TODEVICE); | ||
144 | if (entry->busaddr[i] == 0) { | 142 | if (entry->busaddr[i] == 0) { |
145 | DRM_ERROR("unable to map PCIGART pages!\n"); | 143 | DRM_ERROR("unable to map PCIGART pages!\n"); |
146 | drm_ati_pcigart_cleanup(dev, gart_info); | 144 | drm_ati_pcigart_cleanup(dev, gart_info); |