---

yaml --- r: 209763 b: refs/heads/master c: 156dadc h: refs/heads/master i: 209761: 7a895e2 209759: ddde04b v: v3
git-mirror · Aug 22, 2010 · d18f333 · d18f333
1 parent 00e5e02
commit d18f333
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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);