diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-10 20:16:58 -0500 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-10 20:16:58 -0500 |
commit | 527f9e907c39f7e88abb57eaa8bccb43c8706a3d (patch) | |
tree | 57d00d812c45db7c26703a395ca100145a1bb292 /drivers/gpu/drm/i915/i915_debugfs.c | |
parent | 5d97eb69bd4767ce9973360881fa6ad161510fb0 (diff) |
drm/i915: Remove the global irq wait queue
... as it has been replaced by per-ring waiters.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_debugfs.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_debugfs.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 9cb6061bf9d5..4c8fae9baaad 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c | |||
@@ -1022,7 +1022,6 @@ i915_wedged_write(struct file *filp, | |||
1022 | loff_t *ppos) | 1022 | loff_t *ppos) |
1023 | { | 1023 | { |
1024 | struct drm_device *dev = filp->private_data; | 1024 | struct drm_device *dev = filp->private_data; |
1025 | drm_i915_private_t *dev_priv = dev->dev_private; | ||
1026 | char buf[20]; | 1025 | char buf[20]; |
1027 | int val = 1; | 1026 | int val = 1; |
1028 | 1027 | ||
@@ -1038,12 +1037,7 @@ i915_wedged_write(struct file *filp, | |||
1038 | } | 1037 | } |
1039 | 1038 | ||
1040 | DRM_INFO("Manually setting wedged to %d\n", val); | 1039 | DRM_INFO("Manually setting wedged to %d\n", val); |
1041 | 1040 | i915_handle_error(dev, val); | |
1042 | atomic_set(&dev_priv->mm.wedged, val); | ||
1043 | if (val) { | ||
1044 | wake_up_all(&dev_priv->irq_queue); | ||
1045 | queue_work(dev_priv->wq, &dev_priv->error_work); | ||
1046 | } | ||
1047 | 1041 | ||
1048 | return cnt; | 1042 | return cnt; |
1049 | } | 1043 | } |