projects
/
profile
/
ivi
/
libdrm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
23631fc
)
Correct errors in the usage of pci_map_page.
author
Ian Romanick
<idr@us.ibm.com>
Mon, 16 Jul 2007 17:56:43 +0000
(10:56 -0700)
committer
Ian Romanick
<idr@us.ibm.com>
Mon, 16 Jul 2007 17:56:43 +0000
(10:56 -0700)
With these changes the driver no longer instantly hard-locks a 6600LE
on a PowerPC G5. I haven't tested any 3D apps yet.
shared-core/nouveau_object.c
patch
|
blob
|
history
diff --git
a/shared-core/nouveau_object.c
b/shared-core/nouveau_object.c
index
146c4f1
..
ea0edb0
100644
(file)
--- 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 (d
ev->sg->busaddr[idx] == 0
) {
+ if (d
ma_mapping_error(dev->sg->busaddr[idx])
) {
return DRM_ERR(ENOMEM);
}
}