summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_gem.c
diff options
context:
space:
mode:
authorMika Kuoppala2014-01-30 15:05:48 +0100
committerDaniel Vetter2014-01-30 17:25:38 +0100
commit3fac8978f5d353d350215d7d8dae977d65305f64 (patch)
tree9b4e95d435ef4c0f54bbe86aaefc4275c12e9d27 /drivers/gpu/drm/i915/i915_gem.c
parentdrm/i915: Use i915_hw_context to set reset stats (diff)
downloadkernel-qcow2-linux-3fac8978f5d353d350215d7d8dae977d65305f64.tar.gz
kernel-qcow2-linux-3fac8978f5d353d350215d7d8dae977d65305f64.tar.xz
kernel-qcow2-linux-3fac8978f5d353d350215d7d8dae977d65305f64.zip
drm/i915: Tune down debug output when context is banned
If we have stopped rings then we know that test is running so no need for spam. In addition, only spam when default context gets banned. v2: - make sure default context ban gets shown (Chris) - use helper for checking for default context, everywhere (Chris) v3: - dont be quiet when debug is set (Ben, Daniel) Reference: https://bugs.freedesktop.org/show_bug.cgi?id=73652 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.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 873b6fb34917..08331e105f89 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2317,7 +2317,13 @@ static bool i915_context_is_banned(struct drm_device *dev,
return true;
if (elapsed <= DRM_I915_CTX_BAN_PERIOD) {
- DRM_ERROR("context hanging too fast, declaring banned!\n");
+ if (dev_priv->gpu_error.stop_rings == 0 &&
+ i915_gem_context_is_default(ctx)) {
+ DRM_ERROR("gpu hanging too fast, banning!\n");
+ } else {
+ DRM_DEBUG("context hanging too fast, banning!\n");
+ }
+
return true;
}