From 0d564f9b61903fc3b5f8e71e6e584a3aaebd3442 Mon Sep 17 00:00:00 2001 From: Thomas Backlund <tmb@mageia.org> Date: Sat, 21 Dec 2019 01:50:25 +0200 Subject: [PATCH 1/2] Revert "drm/radeon: simplify and cleanup setting the dma mask" This reverts commit 03127c58b93d7da5edb53118bdafabdcae3581ef. --- drivers/gpu/drm/radeon/radeon_device.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index 5d017f0aec66..1658a2fbd383 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -1380,10 +1380,15 @@ int radeon_device_init(struct radeon_device *rdev, dma_bits = 32; #endif - r = dma_set_mask_and_coherent(&rdev->pdev->dev, DMA_BIT_MASK(dma_bits)); + r = pci_set_dma_mask(rdev->pdev, DMA_BIT_MASK(dma_bits)); if (r) { + dma_bits = 32; 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); -- 2.24.1