diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-04 18:23:51 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-04 18:23:51 -0400 |
| commit | b87297fb405ef13cac375f202d114323b076a56d (patch) | |
| tree | dee71f28b6e8b88668bc77b5c23fa7733f5e5916 /drivers/gpu | |
| parent | b63254c71a46d7af2e3f00342b0592dfcd77b342 (diff) | |
| parent | 0e7ddf7eeeef5aea85412120539ab5369577faeb (diff) | |
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.
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 3 |
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 670d12881468..39f5c658ef5e 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
| @@ -2260,9 +2260,6 @@ try_again: | |||
| 2260 | goto try_again; | 2260 | goto try_again; |
| 2261 | } | 2261 | } |
| 2262 | 2262 | ||
| 2263 | BUG_ON(old_obj_priv->active || | ||
| 2264 | (reg->obj->write_domain & I915_GEM_GPU_DOMAINS)); | ||
| 2265 | |||
| 2266 | /* | 2263 | /* |
| 2267 | * Zap this virtual mapping so we can set up a fence again | 2264 | * Zap this virtual mapping so we can set up a fence again |
| 2268 | * for this object next time we need it. | 2265 | * for this object next time we need it. |