summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2008-06-19 11:27:23 +1000
committerDave Airlie <airlied@redhat.com>2008-06-19 11:27:23 +1000
commit7ec700fcaf4f01ae72956df74a9e0d08938fd26e (patch)
tree9ed0931cd35320af58d5fd256e1d4b1de165ec32
parentb554305905d9bc2184b424aa67712119d5c9fb99 (diff)
downloadop-kernel-dev-7ec700fcaf4f01ae72956df74a9e0d08938fd26e.zip
op-kernel-dev-7ec700fcaf4f01ae72956df74a9e0d08938fd26e.tar.gz
drm: pcigart use proper pci map interfaces.
Switch to using more correct pci dma mapping interfaces. Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/char/drm/ati_pcigart.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/char/drm/ati_pcigart.c b/drivers/char/drm/ati_pcigart.c
index b710426..c533d0c 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
for (i = 0; i < pages; i++) {
if (!entry->busaddr[i])
break;
- pci_unmap_single(dev->pdev, entry->busaddr[i],
+ pci_unmap_page(dev->pdev, entry->busaddr[i],
PAGE_SIZE, PCI_DMA_TODEVICE);
}
@@ -137,10 +137,8 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
for (i = 0; i < pages; i++) {
/* we need to support large memory configurations */
- entry->busaddr[i] = pci_map_single(dev->pdev,
- page_address(entry->
- pagelist[i]),
- PAGE_SIZE, PCI_DMA_TODEVICE);
+ entry->busaddr[i] = pci_map_page(dev->pdev, entry->pagelist[i],
+ 0, PAGE_SIZE, PCI_DMA_TODEVICE);
if (entry->busaddr[i] == 0) {
DRM_ERROR("unable to map PCIGART pages!\n");
drm_ati_pcigart_cleanup(dev, gart_info);
OpenPOWER on IntegriCloud