Commit 111af5c1 authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau: skip move_notify() if bo does not have a vma attached

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 6e32fedc
......@@ -842,13 +842,11 @@ nouveau_bo_move_flips(struct ttm_buffer_object *bo, bool evict, bool intr,
static void
nouveau_bo_move_ntfy(struct ttm_buffer_object *bo, struct ttm_mem_reg *new_mem)
{
struct drm_nouveau_private *dev_priv = nouveau_bdev(bo->bdev);
struct nouveau_mem *node = new_mem->mm_node;
struct nouveau_bo *nvbo = nouveau_bo(bo);
struct nouveau_vma *vma = &nvbo->vma;
struct nouveau_vm *vm = vma->vm;
if (dev_priv->card_type < NV_50)
if (!vma->vm)
return;
switch (new_mem->mem_type) {
......@@ -856,7 +854,7 @@ nouveau_bo_move_ntfy(struct ttm_buffer_object *bo, struct ttm_mem_reg *new_mem)
nouveau_vm_map(vma, node);
break;
case TTM_PL_TT:
if (vma->node->type != vm->spg_shift) {
if (vma->node->type != vma->vm->spg_shift) {
nouveau_vm_unmap(vma);
vma = &node->tmp_vma;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment