diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-01-26 15:39:14 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-01-27 11:05:51 +0000 |
| commit | e110e8d672c9e6e395a5c8bfa3444899b85181ed (patch) | |
| tree | f36039a46c6673394979203bc36ce75cadf863bc /drivers/gpu/drm/i915/i915_gem.c | |
| parent | 1a3665c81df32b23c38d4ba8a74761551d5673b1 (diff) | |
| download | kernel_samsung_smdk4412-e110e8d672c9e6e395a5c8bfa3444899b85181ed.zip kernel_samsung_smdk4412-e110e8d672c9e6e395a5c8bfa3444899b85181ed.tar.gz kernel_samsung_smdk4412-e110e8d672c9e6e395a5c8bfa3444899b85181ed.tar.bz2 | |
drm/i915: Check wedged status before throttling
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -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 a70caf8..b9d4de3 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)) |