Skip to content

Commit

Permalink
drm/i915: Remove a bad BUG_ON in the fence management code.
Browse files Browse the repository at this point in the history
This could be triggered by a gtt mapping fault on 965 that decides to
remove the fence from another object that happens to be active currently.
Since the other object doesn't rely on the fence reg for its execution, we
don't wait for it to finish.  We'll soon be not waiting on 915 most of the
time as well, so just drop the BUG_ON.

Signed-off-by: Eric Anholt <eric@anholt.net>
  • Loading branch information
Eric Anholt committed Jun 4, 2009
1 parent 9fa7eb2 commit 0e7ddf7
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions drivers/gpu/drm/i915/i915_gem.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 0e7ddf7

Please sign in to comment.