diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-01-26 10:39:14 -0500 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-01-27 06:05:51 -0500 |
commit | e110e8d672c9e6e395a5c8bfa3444899b85181ed (patch) | |
tree | f36039a46c6673394979203bc36ce75cadf863bc /drivers/gpu/drm/i915 | |
parent | 1a3665c81df32b23c38d4ba8a74761551d5673b1 (diff) |
drm/i915: Check wedged status before throttling
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 3 |
1 files changed, 3 insertions, 0 deletions
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) | |||
3206 | u32 seqno = 0; | 3206 | u32 seqno = 0; |
3207 | int ret; | 3207 | int ret; |
3208 | 3208 | ||
3209 | if (atomic_read(&dev_priv->mm.wedged)) | ||
3210 | return -EIO; | ||
3211 | |||
3209 | spin_lock(&file_priv->mm.lock); | 3212 | spin_lock(&file_priv->mm.lock); |
3210 | list_for_each_entry(request, &file_priv->mm.request_list, client_list) { | 3213 | list_for_each_entry(request, &file_priv->mm.request_list, client_list) { |
3211 | if (time_after_eq(request->emitted_jiffies, recent_enough)) | 3214 | if (time_after_eq(request->emitted_jiffies, recent_enough)) |