diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-08-15 11:52:34 +0200 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-08-22 08:21:13 +0200 |
| commit | 156dadc180a1bd3a25d644ee6c361afc465ccd0e (patch) | |
| tree | 2a4e58c0d79d44bddf626c55abe9080432d6f010 /drivers | |
| parent | drm/i915/suspend: s/IS_IRONLAKE/HAS_PCH_SPLIT/ (diff) | |
| download | linux-156dadc180a1bd3a25d644ee6c361afc465ccd0e.tar.xz linux-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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 2 |
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 b4b25e17d4e9..994e9f2d688b 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); |