aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-04 15:23:51 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-04 15:23:51 -0700
commitb87297fb405ef13cac375f202d114323b076a56d (patch)
treedee71f28b6e8b88668bc77b5c23fa7733f5e5916
parentb63254c71a46d7af2e3f00342b0592dfcd77b342 (diff)
parent0e7ddf7eeeef5aea85412120539ab5369577faeb (diff)
downloadvexpress-lsk-b87297fb405ef13cac375f202d114323b076a56d.tar.gz
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.
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 670d1288146..39f5c658ef5 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -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.