Commit 03127c58 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Alex Deucher

drm/radeon: simplify and cleanup setting the dma mask

Use dma_set_mask_and_coherent to set both masks in one go, and remove
the no longer required fallback, as the kernel now always accepts
larger than required DMA masks.  Fail the driver probe if we can't
set the DMA mask, as that means the system can only support a larger
mask.
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 90489ce1
...@@ -1382,15 +1382,10 @@ int radeon_device_init(struct radeon_device *rdev, ...@@ -1382,15 +1382,10 @@ int radeon_device_init(struct radeon_device *rdev,
dma_bits = 32; dma_bits = 32;
#endif #endif
r = pci_set_dma_mask(rdev->pdev, DMA_BIT_MASK(dma_bits)); r = dma_set_mask_and_coherent(&rdev->pdev->dev, DMA_BIT_MASK(dma_bits));
if (r) { if (r) {
dma_bits = 32;
pr_warn("radeon: No suitable DMA available\n"); pr_warn("radeon: No suitable DMA available\n");
} return r;
r = pci_set_consistent_dma_mask(rdev->pdev, DMA_BIT_MASK(dma_bits));
if (r) {
pci_set_consistent_dma_mask(rdev->pdev, DMA_BIT_MASK(32));
pr_warn("radeon: No coherent DMA available\n");
} }
rdev->need_swiotlb = drm_need_swiotlb(dma_bits); rdev->need_swiotlb = drm_need_swiotlb(dma_bits);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment