Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

…/git/anholt/drm-intel * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel: drm/i915: Remove a bad BUG_ON in the fence management code.
git-mirror · Jun 4, 2009 · b87297f · b87297f
2 parents b63254c + 0e7ddf7
commit b87297f
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
@@ -2260,9 +2260,6 @@ i915_gem_object_get_fence_reg(struct drm_gem_object *obj, bool write)
 			goto try_again;
 		}
 
-		BUG_ON(old_obj_priv->active ||
-		       (reg->obj->write_domain & I915_GEM_GPU_DOMAINS));
-
 		/*
 		 * Zap this virtual mapping so we can set up a fence again
 		 * for this object next time we need it.