| Message ID | 1252964927-28043-2-git-send-email-bgamari.foss@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Mon, 14 Sep 2009 17:48:41 -0400 Ben Gamari <bgamari.foss@gmail.com> wrote: > i915_wait_request() only checks mm.wedged after it interacts with the > hardware, generally causing the driver to lock up waiting for a wedged > chip. Make sure we check mm.wedged as the first thing we do. > > Signed-off-by: Ben Gamari <bgamari.foss@gmail.com> Applied this series to drm-intel-next, thanks.
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index e0da986..9100513 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1751,6 +1751,9 @@ i915_wait_request(struct drm_device *dev, uint32_t seqno) BUG_ON(seqno == 0); + if (dev_priv->mm.wedged) + return -EIO; + if (!i915_seqno_passed(i915_get_gem_seqno(dev), seqno)) { if (IS_IGDNG(dev)) ier = I915_READ(DEIER) | I915_READ(GTIER);
i915_wait_request() only checks mm.wedged after it interacts with the hardware, generally causing the driver to lock up waiting for a wedged chip. Make sure we check mm.wedged as the first thing we do. Signed-off-by: Ben Gamari <bgamari.foss@gmail.com> --- drivers/gpu/drm/i915/i915_gem.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)