aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_mem.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2011-06-01 14:08:49 +1000
committerBen Skeggs <bskeggs@redhat.com>2011-06-07 09:23:03 +1000
commit4cff3ce5fe5c3c88f103d58c5e7855f9519960e4 (patch)
tree632bd464e02c4f37b5f05a39e6e8c6355351a2b6 /drivers/gpu/drm/nouveau/nouveau_mem.c
parent960bdba08e06a1f35fc2fe784aa293dee58abc68 (diff)
downloadkernel_samsung_smdk4412-4cff3ce5fe5c3c88f103d58c5e7855f9519960e4.zip
kernel_samsung_smdk4412-4cff3ce5fe5c3c88f103d58c5e7855f9519960e4.tar.gz
kernel_samsung_smdk4412-4cff3ce5fe5c3c88f103d58c5e7855f9519960e4.tar.bz2
drm/nv40: fall back to paged dma object for the moment
PCI(E)GART isn't quite stable it seems, fall back to old method until I get the time to sort it out properly. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_mem.c')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_mem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c
index f9efbbb..5ee14d2 100644
--- a/drivers/gpu/drm/nouveau/nouveau_mem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_mem.c
@@ -397,7 +397,7 @@ nouveau_mem_vram_init(struct drm_device *dev)
if (pci_dma_supported(dev->pdev, DMA_BIT_MASK(40)))
dma_bits = 40;
} else
- if (drm_pci_device_is_pcie(dev) &&
+ if (0 && drm_pci_device_is_pcie(dev) &&
dev_priv->chipset > 0x40 &&
dev_priv->chipset != 0x45) {
if (pci_dma_supported(dev->pdev, DMA_BIT_MASK(39)))