From: Maarten Lankhorst Date: Tue, 12 Nov 2013 12:34:12 +0000 (+0100) Subject: drm/nouveau: do not map evicted vram buffers in nouveau_bo_vma_add X-Git-Tag: v3.13-rc8~13^2~17 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d2c7ab32ceb0737c1aba84765c555e0f73d3c935;p=kernel%2Fkernel-generic.git drm/nouveau: do not map evicted vram buffers in nouveau_bo_vma_add Signed-off-by: Maarten Lankhorst Signed-off-by: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index 129acee..c0fde6b 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -1545,7 +1545,8 @@ nouveau_bo_vma_add(struct nouveau_bo *nvbo, struct nouveau_vm *vm, if (nvbo->bo.mem.mem_type == TTM_PL_VRAM) nouveau_vm_map(vma, nvbo->bo.mem.mm_node); - else if (nvbo->bo.mem.mem_type == TTM_PL_TT) { + else if (nvbo->bo.mem.mem_type == TTM_PL_TT && + nvbo->page_shift == vma->vm->vmm->spg_shift) { if (node->sg) nouveau_vm_map_sg_table(vma, 0, size, node); else