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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 478 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
drivers/gpu/drm/drm_fb_helper.c between commit 848499032504 ("drm: add
drm_modeset_lock|unlock_all") from the drm tree and commit
"drivers/gpu/drm/drm_fb_helper.c: avoid sleeping in unblank_screen() if
oops in progress" from the akpm tree.

I can't see an easy way to resolve these, so I just dropped the akpm tree
patch.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Daniel Vetter]

Hi all,

I'm working on some follow-up patches for the drm fb helper library
already, and fixing up the panic handling is on the plan already. And
since the fb helper has its own panic notifier anyway (simply
unblanking is not good enough to display an oops on a kms device) I
think we should simply return without doing anything from our
->fb_blank if an oops is in progress.

So please drop the patch from the akpm tree, I'll take care of this
(and reply to the original patch submission with my plan).

Thanks, Daniel

On Mon, Jan 21, 2013 at 6:43 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got a conflict in
> drivers/gpu/drm/drm_fb_helper.c between commit 848499032504 ("drm: add
> drm_modeset_lock|unlock_all") from the drm tree and commit
> "drivers/gpu/drm/drm_fb_helper.c: avoid sleeping in unblank_screen() if
> oops in progress" from the akpm tree.
>
> I can't see an easy way to resolve these, so I just dropped the akpm tree
> patch.
>
> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au



-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

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

[Stephen Rothwell]

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