NV50 will not attempt to use PCIGART now

This commit is contained in:
Arthur Huillet 2007-07-11 15:01:37 +02:00
parent d26ae22c2b
commit b301a9051b
2 changed files with 5 additions and 0 deletions

View file

@ -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) )

View file

@ -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,