From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Dave Airlie <airlied@linux•ie>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Alexandre Courbot <acourbot@nvidia•com>,
Ben Skeggs <bskeggs@redhat•com>, Christoph Hellwig <hch@lst•de>
Subject: linux-next: manual merge of the akpm tree with the drm tree
Date: Wed, 4 Nov 2015 17:12:50 +1100 [thread overview]
Message-ID: <20151104171250.1ce066ff@canb.auug.org.au> (raw)
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 sfr@canb•auug.org.au
next reply other threads:[~2015-11-04 6:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-04 6:12 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-01-21 5:43 linux-next: manual merge of the akpm tree with the drm tree Stephen Rothwell
2013-01-21 8:43 ` Daniel Vetter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151104171250.1ce066ff@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=acourbot@nvidia$(echo .)com \
--cc=airlied@linux$(echo .)ie \
--cc=akpm@linux-foundation$(echo .)org \
--cc=bskeggs@redhat$(echo .)com \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox