nouveau: don't call pci_dma_supported

Just try to set a 64-bit DMA mask first and retry with the smaller dma_mask
if dma_set_mask failed.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Cc: David Airlie <airlied@linux.ie>
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: Alexandre Courbot <acourbot@nvidia.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Thierry Reding <treding@nvidia.com>
Cc: Dave Airlie <airlied@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
index 3f0fb55cb4733f9caac9d908fdc37ef9fd11ed7a..bb030e6c00ed0e8df725599e27da35691480c911 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
@@ -350,11 +350,14 @@ nouveau_ttm_init(struct nouveau_drm *drm)
 
        bits = nvxx_mmu(&drm->device)->dma_bits;
        if (nvxx_device(&drm->device)->func->pci) {
 
        bits = nvxx_mmu(&drm->device)->dma_bits;
        if (nvxx_device(&drm->device)->func->pci) {

-               if (drm->agp.bridge ||
-                    !pci_dma_supported(dev->pdev, DMA_BIT_MASK(bits)))
+               if (drm->agp.bridge)

                        bits = 32;
 
                ret = pci_set_dma_mask(dev->pdev, DMA_BIT_MASK(bits));
                        bits = 32;
 
                ret = pci_set_dma_mask(dev->pdev, DMA_BIT_MASK(bits));

+               if (ret && bits != 32) {
+                       bits = 32;
+                       ret = pci_set_dma_mask(dev->pdev, DMA_BIT_MASK(bits));
+               }

                if (ret)
                        return ret;
 
                if (ret)
                        return ret;