summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_debugfs.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-11-11 01:16:58 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2010-11-11 01:16:58 +0000
commit527f9e907c39f7e88abb57eaa8bccb43c8706a3d (patch)
tree57d00d812c45db7c26703a395ca100145a1bb292 /drivers/gpu/drm/i915/i915_debugfs.c
parent5d97eb69bd4767ce9973360881fa6ad161510fb0 (diff)
downloadop-kernel-dev-527f9e907c39f7e88abb57eaa8bccb43c8706a3d.zip
op-kernel-dev-527f9e907c39f7e88abb57eaa8bccb43c8706a3d.tar.gz
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.c8
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 9cb6061..4c8fae9 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,
loff_t *ppos)
{
struct drm_device *dev = filp->private_data;
- drm_i915_private_t *dev_priv = dev->dev_private;
char buf[20];
int val = 1;
@@ -1038,12 +1037,7 @@ i915_wedged_write(struct file *filp,
}
DRM_INFO("Manually setting wedged to %d\n", val);
-
- atomic_set(&dev_priv->mm.wedged, val);
- if (val) {
- wake_up_all(&dev_priv->irq_queue);
- queue_work(dev_priv->wq, &dev_priv->error_work);
- }
+ i915_handle_error(dev, val);
return cnt;
}
OpenPOWER on IntegriCloud