]> bbs.cooldavid.org Git - net-next-2.6.git/commit
git://bbs.cooldavid.org / net-next-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 90eb77b) | patch
drm/i915: Remove the conflicting BUG_ON()
authorChris Wilson <chris@chris-wilson.co.uk>
Sun, 15 Aug 2010 09:52:34 +0000 (10:52 +0100)
committerEric Anholt <eric@anholt.net>
Sun, 22 Aug 2010 06:21:13 +0000 (23:21 -0700)
commit156dadc180a1bd3a25d644ee6c361afc465ccd0e
tree2a4e58c0d79d44bddf626c55abe9080432d6f010tree | snapshot (tar.bz2 tar.gz zip)
parent90eb77baaea35c591bd324b31e9eac032bd603c9commit | diff
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>
drivers/gpu/drm/i915/i915_gem.c diff | blob | blame | history
Clone of davem's net-next-2.6 tree