diff options
| author | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2013-11-12 13:34:12 +0100 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2013-11-14 14:57:09 +1000 |
| commit | d2c7ab32ceb0737c1aba84765c555e0f73d3c935 (patch) | |
| tree | 02d5b54db778faefe3d5f7996426160306917833 | |
| parent | 377cfdc6eeced55e220fea2d07d6ebdd32166e66 (diff) | |
| download | op-kernel-dev-d2c7ab32ceb0737c1aba84765c555e0f73d3c935.zip op-kernel-dev-d2c7ab32ceb0737c1aba84765c555e0f73d3c935.tar.gz | |
drm/nouveau: do not map evicted vram buffers in nouveau_bo_vma_add
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_bo.c | 3 |
1 files changed, 2 insertions, 1 deletions
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 |
