---

yaml
---
r: 260120
b: refs/heads/master
c: 111af5c
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e32fedc8b50d3571bdec4e9849e45659ac96599
+refs/heads/master: 111af5c100fa0c0b94301f719dd22dab87f5d0a4

trunk/drivers/gpu/drm/nouveau/nouveau_bo.c

@@ -842,21 +842,19 @@ 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) {
 	case TTM_PL_VRAM:
 		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;
 		}