From 0c575d892d84b5e2f10d7cba57fc1033de655a00 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Wed, 9 Sep 2009 11:50:45 -0700
Subject: [PATCH] --- yaml --- r: 165983 b: refs/heads/master c:
 5323fd042f89164927ee8c311f0a975e8c846412 h: refs/heads/master i:   165981:
 4822d20e0bc609a6b5a9ab9efed7fba9754fc367   165979:
 0c87e7198edd27c3661b10226d94c916faf3829d   165975:
 302b2dd92e1ed283c93e36fb694d0a3470cd7537   165967:
 3ccbaed06110cdb8c178ec04cbfa9f6dd9fbd364   165951:
 f6818053a3e17195161577e5e4aaa6828b3c99aa v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/gpu/drm/i915/i915_gem.c | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index af53c92347b3..7c8f69a44866 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7839c5d5519b6d9e2ccf3cdbf1c39e3817ad0835
+refs/heads/master: 5323fd042f89164927ee8c311f0a975e8c846412
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
index 954fb699131b..f3758f9fc979 100644
--- a/trunk/drivers/gpu/drm/i915/i915_gem.c
+++ b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -1915,6 +1915,12 @@ i915_gem_object_unbind(struct drm_gem_object *obj)
 		return -EINVAL;
 	}
 
+	/* blow away mappings if mapped through GTT */
+	i915_gem_release_mmap(obj);
+
+	if (obj_priv->fence_reg != I915_FENCE_REG_NONE)
+		i915_gem_clear_fence_reg(obj);
+
 	/* Move the object to the CPU domain to ensure that
 	 * any possible CPU writes while it's not in the GTT
 	 * are flushed when we go to remap it. This will
@@ -1928,20 +1934,14 @@ i915_gem_object_unbind(struct drm_gem_object *obj)
 		return ret;
 	}
 
+	BUG_ON(obj_priv->active);
+
 	if (obj_priv->agp_mem != NULL) {
 		drm_unbind_agp(obj_priv->agp_mem);
 		drm_free_agp(obj_priv->agp_mem, obj->size / PAGE_SIZE);
 		obj_priv->agp_mem = NULL;
 	}
 
-	BUG_ON(obj_priv->active);
-
-	/* blow away mappings if mapped through GTT */
-	i915_gem_release_mmap(obj);
-
-	if (obj_priv->fence_reg != I915_FENCE_REG_NONE)
-		i915_gem_clear_fence_reg(obj);
-
 	i915_gem_object_put_pages(obj);
 
 	if (obj_priv->gtt_space) {