aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-08-15 10:52:34 +0100
committerEric Anholt <eric@anholt.net>2010-08-21 23:21:13 -0700
commit156dadc180a1bd3a25d644ee6c361afc465ccd0e (patch)
tree2a4e58c0d79d44bddf626c55abe9080432d6f010
parent90eb77baaea35c591bd324b31e9eac032bd603c9 (diff)
downloadmrst-s0i3-test-156dadc180a1bd3a25d644ee6c361afc465ccd0e.tar.gz
mrst-s0i3-test-156dadc180a1bd3a25d644ee6c361afc465ccd0e.tar.xz
mrst-s0i3-test-156dadc180a1bd3a25d644ee6c361afc465ccd0e.zip
drm/i915: Remove the conflicting BUG_ON()
We now attempt to free "active" objects following a GPU hang as either the GPU will be reset or the hang is permenant. In either case, the GPU writes will not be flushed to main memory and it should be safe to return that memory back to the system. The BUG_ON(active) is thus overkill and can erroneously fire after a EIO. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Eric Anholt <eric@anholt.net>
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index b4b25e17d4e..994e9f2d688 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1979,8 +1979,6 @@ i915_gem_object_unbind(struct drm_gem_object *obj)
* cause memory corruption through use-after-free.
*/
- BUG_ON(obj_priv->active);
-
/* release the fence reg _after_ flushing */
if (obj_priv->fence_reg != I915_FENCE_REG_NONE)
i915_gem_clear_fence_reg(obj);