]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
drm/i915: Check wedged status before throttling
authorChris Wilson <chris@chris-wilson.co.uk>
Wed, 26 Jan 2011 15:39:14 +0000 (15:39 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Thu, 27 Jan 2011 11:05:51 +0000 (11:05 +0000)
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
drivers/gpu/drm/i915/i915_gem.c

index a70caf8b26886ce9e30ed7a755ef302624a32917..b9d4de368de3d1cc47cf723ca2de48c85f2aa48c 100644 (file)
@@ -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))