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 --- drivers/gpu/drm/nouveau/nouveau_ttm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c index 3f0fb55..bb030e6 100644 --- 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) { - 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)); + if (ret && bits != 32) { + bits = 32; + ret = pci_set_dma_mask(dev->pdev, DMA_BIT_MASK(bits)); + } if (ret) return ret;