diff options
| author | Ben Widawsky <ben@bwidawsk.net> | 2011-06-29 10:26:42 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-06-29 10:32:08 -0700 |
| commit | 3e0dc6b01f5301d63046f6deddde2c7f5c57d67a (patch) | |
| tree | 9621e6d1a4b85e68d33a40324b0cb05955fc1212 /drivers/gpu/drm/i915/i915_gem.c | |
| parent | 23b2f8bb92feb83127679c53633def32d3108e70 (diff) | |
| download | op-kernel-dev-3e0dc6b01f5301d63046f6deddde2c7f5c57d67a.zip op-kernel-dev-3e0dc6b01f5301d63046f6deddde2c7f5c57d67a.tar.gz | |
drm/i915: hangcheck disable parameter
Provide a parameter to disable hanghcheck. This is useful mostly for
developers trying to debug known problems, and probably should not be
touched by normal users.
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 71cc8a3..8b670e7 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1779,8 +1779,11 @@ i915_add_request(struct intel_ring_buffer *ring, ring->outstanding_lazy_request = false; if (!dev_priv->mm.suspended) { - mod_timer(&dev_priv->hangcheck_timer, - jiffies + msecs_to_jiffies(DRM_I915_HANGCHECK_PERIOD)); + if (i915_enable_hangcheck) { + mod_timer(&dev_priv->hangcheck_timer, + jiffies + + msecs_to_jiffies(DRM_I915_HANGCHECK_PERIOD)); + } if (was_empty) queue_delayed_work(dev_priv->wq, &dev_priv->mm.retire_work, HZ); |
