summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur Huillet <arthur.huillet@free.fr>2007-07-11 15:01:37 +0200
committerArthur Huillet <arthur.huillet@free.fr>2007-07-11 15:01:37 +0200
commitb301a9051b3fd9ad3dce6bcf32b06da7953a8b91 (patch)
tree8f749b2d4ac6cc68e21c2316553536c45b0af6ff
parentd26ae22c2b17e0f193334cefec7d141befcfa1ee (diff)
NV50 will not attempt to use PCIGART now
-rw-r--r--shared-core/nouveau_mem.c3
-rw-r--r--shared-core/nouveau_object.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/shared-core/nouveau_mem.c b/shared-core/nouveau_mem.c
index c545acf2..a428b813 100644
--- a/shared-core/nouveau_mem.c
+++ b/shared-core/nouveau_mem.c
@@ -349,6 +349,9 @@ int nouveau_mem_init(struct drm_device *dev)
}
no_agp:
+
+ if ( dev_priv->card_type >= NV_50 ) goto no_pci;
+
dev_priv->pci_heap = NULL;
DRM_DEBUG("Allocating sg memory for PCI DMA\n");
if ( drm_sg_alloc(dev, &sgreq) )
diff --git a/shared-core/nouveau_object.c b/shared-core/nouveau_object.c
index 82944c2b..0fe32fda 100644
--- a/shared-core/nouveau_object.c
+++ b/shared-core/nouveau_object.c
@@ -890,6 +890,8 @@ nouveau_gpuobj_channel_init(drm_device_t *dev, int channel,
}
}
else {
+ if ( dev_priv -> card_type >= NV_50 ) return 0; /*no PCIGART for NV50*/
+
/*PCI*/
if((ret = nouveau_gpuobj_dma_new(dev, channel, NV_CLASS_DMA_IN_MEMORY,
(unsigned int) dev->sg->virtual, dev->sg->pages * PAGE_SIZE,