diff options
| author | Mika Kuoppala | 2013-07-03 16:22:08 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2013-07-16 12:44:02 +0200 |
| commit | 10cd45b6e8ac1d1a99f6bdf0e0c80f2a1351f3f5 (patch) | |
| tree | 19ebae16415974dfb28c127176c3ac59b46bea03 /drivers/gpu/drm/i915/i915_gem.c | |
| parent | drm/i915: Replace open-coding of DEFAULT_CONTEXT_ID (diff) | |
| download | kernel-qcow2-linux-10cd45b6e8ac1d1a99f6bdf0e0c80f2a1351f3f5.tar.gz kernel-qcow2-linux-10cd45b6e8ac1d1a99f6bdf0e0c80f2a1351f3f5.tar.xz kernel-qcow2-linux-10cd45b6e8ac1d1a99f6bdf0e0c80f2a1351f3f5.zip | |
drm/i915: introduce i915_queue_hangcheck
To run hangcheck in near future.
Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 53c39bcf8e0e..df6ba10bf3a0 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2083,10 +2083,8 @@ int __i915_add_request(struct intel_ring_buffer *ring, ring->outstanding_lazy_request = 0; if (!dev_priv->ums.mm_suspended) { - if (i915_enable_hangcheck) { - mod_timer(&dev_priv->gpu_error.hangcheck_timer, - round_jiffies_up(jiffies + DRM_I915_HANGCHECK_JIFFIES)); - } + i915_queue_hangcheck(ring->dev); + if (was_empty) { queue_delayed_work(dev_priv->wq, &dev_priv->mm.retire_work, |