---

yaml --- r: 348447 b: refs/heads/master c: e8e8962 h: refs/heads/master i: 348445: 43c6bb6 348443: 082b6f5 348439: a7ba161 348431: 077694c 348415: 2ea98c0 v: v3
git-mirror · Jan 8, 2013 · 987fdb4 · 987fdb4
1 parent 97e9c26
commit 987fdb4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c75be2592c350035ce871624ebf549b4609aeeab
+refs/heads/master: e8e89622ed361c46bf90ba4828e685a8b603f7e5
diff --git a/trunk/drivers/gpu/drm/ttm/ttm_bo_util.c b/trunk/drivers/gpu/drm/ttm/ttm_bo_util.c
@@ -654,11 +654,13 @@ int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo,
 		 */
 
 		set_bit(TTM_BO_PRIV_FLAG_MOVING, &bo->priv_flags);
+
+		/* ttm_buffer_object_transfer accesses bo->sync_obj */
+		ret = ttm_buffer_object_transfer(bo, &ghost_obj);
 		spin_unlock(&bdev->fence_lock);
 		if (tmp_obj)
 			driver->sync_obj_unref(&tmp_obj);
 
-		ret = ttm_buffer_object_transfer(bo, &ghost_obj);
 		if (ret)
 			return ret;