From 987fdb4ce01fba10c69a1bdb5d5260ee9080c675 Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Tue, 18 Dec 2012 22:25:11 +0100
Subject: [PATCH] --- yaml --- r: 348447 b: refs/heads/master c:
 e8e89622ed361c46bf90ba4828e685a8b603f7e5 h: refs/heads/master i:   348445:
 43c6bb6cb67d4e81988a6c4cf228a92072bf8357   348443:
 082b6f56b05cab5013cee341aade53d7f5d77cf6   348439:
 a7ba1611071002988598ea0b55dcf908d705b9e8   348431:
 077694c63749a14f70f10236bf841bebe943eef6   348415:
 2ea98c04aa9cacddb3f0d3f3feda9ae6df47e480 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/gpu/drm/ttm/ttm_bo_util.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fb433b55bc81..73cd691f26e3 100644
--- 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
index 9e9c5d2a5c74..d73d6e3e17b2 100644
--- 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;