Commit b87297fb authored Jun 04, 2009 by Linus Torvalds

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.

drivers/gpu/drm/i915/i915_gem.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -2260,9 +2260,6 @@ try_again:
		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.