summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2007-07-16 10:56:43 -0700
committerIan Romanick <idr@us.ibm.com>2007-07-16 10:56:43 -0700
commit70a8a60a3e81c18f9c6485102cb226c340c3cd73 (patch)
treeae22f11de5a1ba68acaf45581cf718fc9f8ad822
parent23631fca09a9769d2391ebdec1f186cf33bf984e (diff)
Correct errors in the usage of pci_map_page.
With these changes the driver no longer instantly hard-locks a 6600LE on a PowerPC G5. I haven't tested any 3D apps yet.
-rw-r--r--shared-core/nouveau_object.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/shared-core/nouveau_object.c b/shared-core/nouveau_object.c
index 146c4f1c..ea0edb08 100644
--- a/shared-core/nouveau_object.c
+++ b/shared-core/nouveau_object.c
@@ -672,10 +672,10 @@ nouveau_gpuobj_dma_new(struct drm_device *dev, int channel, int class,
pci_map_page(dev->pdev,
dev->sg->pagelist[idx],
0,
- DMA_31BIT_MASK,
+ PAGE_SIZE,
DMA_BIDIRECTIONAL);
- if (dev->sg->busaddr[idx] == 0) {
+ if (dma_mapping_error(dev->sg->busaddr[idx])) {
return DRM_ERR(ENOMEM);
}
}