From b09f3ac61b3b627239142958db5f6d480a17f587 Mon Sep 17 00:00:00 2001
From: Jerome Glisse <jglisse@redhat.com>
Date: Thu, 12 Jul 2012 18:23:05 -0400
Subject: [PATCH] --- yaml --- r: 318735 b: refs/heads/master c:
 d1c7871ddb1f588b8eb35affd9ee1a3d5e11cd0c h: refs/heads/master i:   318733:
 92531c2d911090727b03e7ba10aaf115c92f067f   318731:
 222d04f638e41fbb4c8ff0fc4b68f621ccb67314   318727:
 3e27f19e98ec66966f4c1a54147521a5cc64208a   318719:
 e36cabd698143e4e1cd447f4309519a38e947e14 v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/gpu/drm/radeon/radeon_object.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c541ffd272ba..7afa160c263c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 949c4a34afacfe800fc442afac117aba15284962
+refs/heads/master: d1c7871ddb1f588b8eb35affd9ee1a3d5e11cd0c
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_object.c b/trunk/drivers/gpu/drm/radeon/radeon_object.c
index 1f77a5afc011..1f1a4c803c1d 100644
--- a/trunk/drivers/gpu/drm/radeon/radeon_object.c
+++ b/trunk/drivers/gpu/drm/radeon/radeon_object.c
@@ -136,7 +136,6 @@ int radeon_bo_create(struct radeon_device *rdev,
 	acc_size = ttm_bo_dma_acc_size(&rdev->mman.bdev, size,
 				       sizeof(struct radeon_bo));
 
-retry:
 	bo = kzalloc(sizeof(struct radeon_bo), GFP_KERNEL);
 	if (bo == NULL)
 		return -ENOMEM;
@@ -150,6 +149,8 @@ int radeon_bo_create(struct radeon_device *rdev,
 	bo->surface_reg = -1;
 	INIT_LIST_HEAD(&bo->list);
 	INIT_LIST_HEAD(&bo->va);
+
+retry:
 	radeon_ttm_placement_from_domain(bo, domain);
 	/* Kernel allocation are uninterruptible */
 	down_read(&rdev->pm.mclk_lock);