drm/nouveau/ttm: convert to DMA API
The pci_dma_* functions are now superseeded in the kernel by the DMA API. Make the conversion to this more generic API. Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
parent
68b566534c
commit
524883bb48
|
@ -338,7 +338,7 @@ nouveau_ttm_init(struct nouveau_drm *drm)
|
||||||
struct nvkm_device *device = nvxx_device(&drm->device);
|
struct nvkm_device *device = nvxx_device(&drm->device);
|
||||||
struct nvkm_pci *pci = device->pci;
|
struct nvkm_pci *pci = device->pci;
|
||||||
struct drm_device *dev = drm->dev;
|
struct drm_device *dev = drm->dev;
|
||||||
u32 bits;
|
u8 bits;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if (pci && pci->agp.bridge) {
|
if (pci && pci->agp.bridge) {
|
||||||
|
@ -351,18 +351,16 @@ nouveau_ttm_init(struct nouveau_drm *drm)
|
||||||
bits = nvxx_mmu(&drm->device)->dma_bits;
|
bits = nvxx_mmu(&drm->device)->dma_bits;
|
||||||
if (nvxx_device(&drm->device)->func->pci) {
|
if (nvxx_device(&drm->device)->func->pci) {
|
||||||
if (drm->agp.bridge ||
|
if (drm->agp.bridge ||
|
||||||
!pci_dma_supported(dev->pdev, DMA_BIT_MASK(bits)))
|
!dma_supported(dev->dev, DMA_BIT_MASK(bits)))
|
||||||
bits = 32;
|
bits = 32;
|
||||||
|
|
||||||
ret = pci_set_dma_mask(dev->pdev, DMA_BIT_MASK(bits));
|
ret = dma_set_mask(dev->dev, DMA_BIT_MASK(bits));
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
ret = pci_set_consistent_dma_mask(dev->pdev,
|
ret = dma_set_coherent_mask(dev->dev, DMA_BIT_MASK(bits));
|
||||||
DMA_BIT_MASK(bits));
|
|
||||||
if (ret)
|
if (ret)
|
||||||
pci_set_consistent_dma_mask(dev->pdev,
|
dma_set_coherent_mask(dev->dev, DMA_BIT_MASK(32));
|
||||||
DMA_BIT_MASK(32));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = nouveau_ttm_global_init(drm);
|
ret = nouveau_ttm_global_init(drm);
|
||||||
|
|
Loading…
Reference in New Issue