summaryrefslogtreecommitdiff
path: root/drm
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2016-11-08 09:43:50 +1000
committerBen Skeggs <bskeggs@redhat.com>2016-11-08 11:20:13 +1000
commit68889236bcd217dcc4f70a5b462fec457d6b9982 (patch)
tree9de4aba6f7a8f1929261325f3f7314e6d39da534 /drm
parente2401e11cb09a4f93602d7d3d61f0b3f636f7809 (diff)
downloadnouveau-68889236bcd217dcc4f70a5b462fec457d6b9982.tar.gz
device/pci: fix oops if no mmu subdev present
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drm')
-rw-r--r--drm/nouveau/nvkm/engine/device/pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drm/nouveau/nvkm/engine/device/pci.c b/drm/nouveau/nvkm/engine/device/pci.c
index 0030cd954..74a1ffa42 100644
--- a/drm/nouveau/nvkm/engine/device/pci.c
+++ b/drm/nouveau/nvkm/engine/device/pci.c
@@ -1687,7 +1687,7 @@ nvkm_device_pci_new(struct pci_dev *pci_dev, const char *cfg, const char *dbg,
* This is necessary for platforms where the default DMA mask of 32
* does not cover any system memory, i.e., when all RAM is > 4 GB.
*/
- if (subdev_mask & BIT(NVKM_SUBDEV_MMU))
+ if (pdev->device.mmu)
dma_set_mask_and_coherent(&pci_dev->dev,
DMA_BIT_MASK(pdev->device.mmu->dma_bits));