---

yaml
---
r: 348943
b: refs/heads/master
c: 6305418
h: refs/heads/master
i:
  348941: 572a47b
  348939: decadf6
  348935: 0df85d4
  348927: d5027f0
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffb5fd53ef27df22a6850019ecb5488686a573f1
+refs/heads/master: 630541863b29f88c7ab34e647758344e4cd1eafd

trunk/drivers/gpu/drm/ttm/ttm_bo_util.c

@@ -344,8 +344,12 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo,
 
 	if (ttm->state == tt_unpopulated) {
 		ret = ttm->bdev->driver->ttm_tt_populate(ttm);
-		if (ret)
+		if (ret) {
+			/* if we fail here don't nuke the mm node
+			 * as the bo still owns it */
+			old_copy.mm_node = NULL;
 			goto out1;
+		}
 	}
 
 	add = 0;
@@ -371,8 +375,11 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo,
 						   prot);
 		} else
 			ret = ttm_copy_io_page(new_iomap, old_iomap, page);
-		if (ret)
+		if (ret) {
+			/* failing here, means keep old copy as-is */
+			old_copy.mm_node = NULL;
 			goto out1;
+		}
 	}
 	mb();
 out2: