From d18f3335b63ff858af401d779a9e2f156154acbb Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun, 15 Aug 2010 10:52:34 +0100
Subject: [PATCH] --- yaml --- r: 209763 b: refs/heads/master c:
 156dadc180a1bd3a25d644ee6c361afc465ccd0e h: refs/heads/master i:   209761:
 7a895e2aedf025f2fa86765b985f6a9fe7ab04e1   209759:
 ddde04b92667e89640776045923452d1f1c735de v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/i915_gem.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3af419fb6d11..6b837a3d562c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90eb77baaea35c591bd324b31e9eac032bd603c9
+refs/heads/master: 156dadc180a1bd3a25d644ee6c361afc465ccd0e
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
index b4b25e17d4e9..994e9f2d688b 100644
--- a/trunk/drivers/gpu/drm/i915/i915_gem.c
+++ b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -1979,8 +1979,6 @@ i915_gem_object_unbind(struct drm_gem_object *obj)
 	 * cause memory corruption through use-after-free.
 	 */
 
-	BUG_ON(obj_priv->active);
-
 	/* release the fence reg _after_ flushing */
 	if (obj_priv->fence_reg != I915_FENCE_REG_NONE)
 		i915_gem_clear_fence_reg(obj);