diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-01-11 15:50:26 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-02-25 06:44:10 +1000 |
| commit | e0435120a8e91990e995ffacb109f82cd44fdfc1 (patch) | |
| tree | 10c6f0fdd02958f4d9173b730e4d86d7cfd27cc6 /drivers/gpu/drm/nouveau/nouveau_mem.c | |
| parent | 7948758d27be1b69b6a79ed4f3f22e36a3b95965 (diff) | |
| download | kernel_samsung_smdk4412-e0435120a8e91990e995ffacb109f82cd44fdfc1.zip kernel_samsung_smdk4412-e0435120a8e91990e995ffacb109f82cd44fdfc1.tar.gz kernel_samsung_smdk4412-e0435120a8e91990e995ffacb109f82cd44fdfc1.tar.bz2 | |
drm/nv40: support for 39-bit dma addresses on native PCIE chipsets
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.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c index 123969d..5cf924e 100644 --- a/drivers/gpu/drm/nouveau/nouveau_mem.c +++ b/drivers/gpu/drm/nouveau/nouveau_mem.c @@ -393,11 +393,17 @@ nouveau_mem_vram_init(struct drm_device *dev) struct ttm_bo_device *bdev = &dev_priv->ttm.bdev; int ret, dma_bits; - if (dev_priv->card_type >= NV_50 && - pci_dma_supported(dev->pdev, DMA_BIT_MASK(40))) - dma_bits = 40; - else - dma_bits = 32; + dma_bits = 32; + if (dev_priv->card_type >= NV_50) { + if (pci_dma_supported(dev->pdev, DMA_BIT_MASK(40))) + dma_bits = 40; + } else + if (drm_pci_device_is_pcie(dev) && + dev_priv->chipset != 0x40 && + dev_priv->chipset != 0x45) { + if (pci_dma_supported(dev->pdev, DMA_BIT_MASK(39))) + dma_bits = 39; + } ret = pci_set_dma_mask(dev->pdev, DMA_BIT_MASK(dma_bits)); if (ret) |