From 77777b692eb1efc3b4bd872f3ba54632911852ca Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Mon, 22 Aug 2011 03:15:05 +0000
Subject: [PATCH] --- yaml --- r: 263195 b: refs/heads/master c:
 8d3bb23609d4ae22803a15d232289fc09a7b61c4 h: refs/heads/master i:   263193:
 9da29bdf5d386e4cd08f7254db82531ac7b03372   263191:
 92f4a995f1fbf0dce1ebee586ec67a59357c010d v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/gpu/drm/ttm/ttm_bo.c | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 3676b32166f1..f8aac944d590 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eac2095398668f989a3dd8d00be1b87850d78c01
+refs/heads/master: 8d3bb23609d4ae22803a15d232289fc09a7b61c4
diff --git a/trunk/drivers/gpu/drm/ttm/ttm_bo.c b/trunk/drivers/gpu/drm/ttm/ttm_bo.c
index 384116afe5b7..a4d38d85909a 100644
--- a/trunk/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/trunk/drivers/gpu/drm/ttm/ttm_bo.c
@@ -392,10 +392,12 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo,
 	 * Create and bind a ttm if required.
 	 */
 
-	if (!(new_man->flags & TTM_MEMTYPE_FLAG_FIXED) && (bo->ttm == NULL)) {
-		ret = ttm_bo_add_ttm(bo, false);
-		if (ret)
-			goto out_err;
+	if (!(new_man->flags & TTM_MEMTYPE_FLAG_FIXED)) {
+		if (bo->ttm == NULL) {
+			ret = ttm_bo_add_ttm(bo, false);
+			if (ret)
+				goto out_err;
+		}
 
 		ret = ttm_tt_set_placement_caching(bo->ttm, mem->placement);
 		if (ret)