[PATCH 7/7] drm/nouveau: use a single vma for display

2013-11-12 Thread maarten.lankho...@canonical.com
From: Maarten Lankhorst No need to map the same vma multiple times. Signed-off-by: Maarten Lankhorst --- drivers/gpu/drm/nouveau/nouveau_fence.h | 4 ++-- drivers/gpu/drm/nouveau/nv50_display.c | 13 ++--- drivers/gpu/drm/nouveau/nv50_display.h | 2 +- drivers/gpu/drm/nouveau/nv50_

[PATCH 6/7] drm/nouveau: more paranoia in nouveau_bo_fixup_align

2013-11-12 Thread maarten.lankho...@canonical.com
From: Maarten Lankhorst Make sure that buffers are always aligned. Signed-off-by: Maarten Lankhorst --- drivers/gpu/drm/nouveau/nouveau_bo.c | 40 +++- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/driver

[PATCH 5/7] drm/nouveau: do not map evicted vram buffers in nouveau_bo_vma_add

2013-11-12 Thread maarten.lankho...@canonical.com
From: Maarten Lankhorst Signed-off-by: Maarten Lankhorst --- drivers/gpu/drm/nouveau/nouveau_bo.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index 9ecb874..bb3734d 100644 --- a/drivers/gpu/dr

[PATCH 4/7] drm/nvc0-/gr: shift wrapping bug in nvc0_grctx_generate_r406800

2013-11-12 Thread maarten.lankho...@canonical.com
From: Dan Carpenter We care about the upper 32 bits here so we have to use 1ULL instead of 1 to avoid a shift wrapping bug. Signed-off-by: Dan Carpenter Signed-off-by: Maarten Lankhorst --- drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(

[PATCH 3/7] drm/nouveau: fixup locking inversion between mmap_sem and reservations

2013-11-12 Thread maarten.lankho...@canonical.com
From: Maarten Lankhorst Allocate and copy all kernel memory before doing reservations. This prevents a locking inversion between mmap_sem and reservation_class, and allows us to drop the trylocking in ttm_bo_vm_fault without upsetting lockdep. Relocations are handled by trying with __copy_from

[PATCH 2/7] drm/nv50-: untile mmap'd bo's

2013-11-12 Thread maarten.lankho...@canonical.com
From: Maarten Lankhorst Map the GART to the bar and use that mapping, to hide all the tiling details from users. Signed-off-by: Maarten Lankhorst --- drivers/gpu/drm/nouveau/core/subdev/bar/nv50.c | 5 - drivers/gpu/drm/nouveau/core/subdev/bar/nvc0.c | 5 - drivers/gpu/drm/nouveau/n

[PATCH 1/7] drm/nouveau: fix m2mf copy to tiled gart

2013-11-12 Thread maarten.lankho...@canonical.com
From: Maarten Lankhorst Commit de7b7d59d54852c introduced tiled GART, but a linear copy is still performed. This may result in errors on eviction, fix it by checking tiling from memtype. Signed-off-by: Maarten Lankhorst Cc: stable at vger.kernel.org #3.10+ --- drivers/gpu/drm/nouveau/nouveau_b