diff options
| author | Mika Kuoppala | 2014-03-28 17:18:18 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2014-04-09 15:07:42 +0200 |
| commit | 88b4aa8770d7779b7eaad47a0b5a32374f07f476 (patch) | |
| tree | eadec76f7ebe8199ea907d3ca78f59398e5360eb /drivers/gpu/drm/i915/i915_gem.c | |
| parent | drm/i915: dma_buf_vunmap is presumed not to fail, don't let it (diff) | |
| download | kernel-qcow2-linux-88b4aa8770d7779b7eaad47a0b5a32374f07f476.tar.gz kernel-qcow2-linux-88b4aa8770d7779b7eaad47a0b5a32374f07f476.tar.xz kernel-qcow2-linux-88b4aa8770d7779b7eaad47a0b5a32374f07f476.zip | |
drm/i915: add flags to i915_ring_stop
Piglit runner and QA are both looking at the dmesg for
DRM_ERRORs with test cases. Add a flag to control those
when we they are expected from related test cases.
Also add flag to control if contexts should be banned
that introduced the hang. Hangcheck is timer based and
preventing bans by adding sleeps to testcases makes
testing slower.
v2: intel_ring_stopped(), readable comment (Chris)
v3: keep compatibility (Daniel)
References: https://bugs.freedesktop.org/show_bug.cgi?id=75876
Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
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 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 6370a761d137..85c9cf055f55 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2277,8 +2277,9 @@ static bool i915_context_is_banned(struct drm_i915_private *dev_priv, if (!i915_gem_context_is_default(ctx)) { DRM_DEBUG("context hanging too fast, banning!\n"); return true; - } else if (dev_priv->gpu_error.stop_rings == 0) { - DRM_ERROR("gpu hanging too fast, banning!\n"); + } else if (i915_stop_ring_allow_ban(dev_priv)) { + if (i915_stop_ring_allow_warn(dev_priv)) + DRM_ERROR("gpu hanging too fast, banning!\n"); return true; } } |