| From e734e113b6e30ba4c48c1a52a31ebda26aa4ae30 Mon Sep 17 00:00:00 2001 |
| From: Daniel Vetter <daniel.vetter@ffwll.ch> |
| Date: Wed, 28 Aug 2013 10:57:59 +0200 |
| Subject: drm/i915: tune down hangcheck noise |
| |
| We already have a big splashing *ERROR* for all the relevant cases of |
| hangs, so this one here is redudant. And it results in an unclean |
| dmesg when running with simulated hangs. Regression has been |
| introduced in |
| |
| commit 05407ff889ceebe383aa5907219f86582ef96b72 |
| Author: Mika Kuoppala <mika.kuoppala@linux.intel.com> |
| Date: Thu May 30 09:04:29 2013 +0300 |
| |
| drm/i915: detect hang using per ring hangcheck_score |
| |
| Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com> |
| Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=68641 |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit b8d88d1d40c18d42e3fedc289832e28d14bc1f00) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/i915_irq.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c |
| index 0eac036fb833..4c137d6ea761 100644 |
| --- a/drivers/gpu/drm/i915/i915_irq.c |
| +++ b/drivers/gpu/drm/i915/i915_irq.c |
| @@ -2073,9 +2073,9 @@ static void i915_hangcheck_elapsed(unsigned long data) |
| |
| for_each_ring(ring, dev_priv, i) { |
| if (ring->hangcheck.score > FIRE) { |
| - DRM_ERROR("%s on %s\n", |
| - stuck[i] ? "stuck" : "no progress", |
| - ring->name); |
| + DRM_INFO("%s on %s\n", |
| + stuck[i] ? "stuck" : "no progress", |
| + ring->name); |
| rings_hung++; |
| } |
| } |
| -- |
| 1.8.5.rc3 |
| |
