linux-next: manual merge of the drm tree with Linus' tree

[Stephen Rothwell]

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/nouveau/nouveau_mem.c between commit
ef1b287169cd3d1e428c8ed8222e0bbf733d5dbb ("drm/nouveau: fix regression
causing ttm to not be able to evict vram") from Linus' tree and commit
8f7286f8e4e80f7b868ba3d117ae900f0d207cbe ("drm/nv50: support for
compression") from the drm tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/gpu/drm/nouveau/nouveau_mem.c
index b0fb9bd,63b9040..0000000
--- a/drivers/gpu/drm/nouveau/nouveau_mem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_mem.c
@@@ -724,11 -740,9 +740,11 @@@ nouveau_vram_manager_new(struct ttm_mem
  
  	ret = vram->get(dev, mem->num_pages << PAGE_SHIFT,
  			mem->page_alignment << PAGE_SHIFT, size_nc,
- 			(nvbo->tile_flags >> 8) & 0xff, &node);
+ 			(nvbo->tile_flags >> 8) & 0x3ff, &node);
 -	if (ret)
 -		return ret;
 +	if (ret) {
 +		mem->mm_node = NULL;
 +		return (ret == -ENOSPC) ? 0 : ret;
 +	}
  
  	node->page_shift = 12;
  	if (nvbo->vma.node)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/