Subject: linux-next: manual merge of the akpm tree with the drm tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 4 Nov 2015 17:12:50 +1100

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in:

  drivers/gpu/drm/nouveau/nouveau_ttm.c

between commits:

  524883bb4846 ("drm/nouveau/ttm: convert to DMA API")
  b31cf78b9324 ("drm/nouveau/ttm: set the DMA mask for platform devices")

from the drm tree and patch:

  "nouveau: don't call pci_dma_supported"

from the akpm tree.

I fixed it up (so the patch now looks like below) and can carry the fix
as necessary (no action is required).

diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
index 3f713c1b5dc1..d2e7d209f651 100644
--- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
@@ -353,8 +353,7 @@ 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 ||
-		     !dma_supported(dev->dev, DMA_BIT_MASK(bits)))
+		if (drm->agp.bridge)
 			bits = 32;
 	} else if (device->func->tegra) {
 		struct nvkm_device_tegra *tegra = device->func->tegra(device);
@@ -369,6 +368,10 @@ nouveau_ttm_init(struct nouveau_drm *drm)
 	}
 
 	ret = dma_set_mask(dev->dev, DMA_BIT_MASK(bits));
+	if (ret && bits != 32) {
+		bits = 32;
+		ret = dma_set_mask(dev->dev, DMA_BIT_MASK(bits));
+	}
 	if (ret)
 		return ret;

-- 
Cheers,
Stephen Rothwell                    [email-masked]