From: Chris Wilson Date: Wed, 26 Jan 2011 15:39:14 +0000 (+0000) Subject: drm/i915: Check wedged status before throttling X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=e110e8d672c9e6e395a5c8bfa3444899b85181ed;p=deliverable%2Flinux.git drm/i915: Check wedged status before throttling Signed-off-by: Chris Wilson --- diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index a70caf8b2688..b9d4de368de3 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -3206,6 +3206,9 @@ i915_gem_ring_throttle(struct drm_device *dev, struct drm_file *file) u32 seqno = 0; int ret; + if (atomic_read(&dev_priv->mm.wedged)) + return -EIO; + spin_lock(&file_priv->mm.lock); list_for_each_entry(request, &file_priv->mm.request_list, client_list) { if (time_after_eq(request->emitted_jiffies, recent_enough))