Attachment 88192 Details for Bug 70747 – patch v2

[patch] patch v2

0001-drm-i915-handle-faked-missed-interrupts-as-simulated.patch (text/plain), 1.41 KB, created by Daniel Vetter on 2013-10-27 18:48:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Vetter

Created: 2013-10-27 18:48:08 UTC

Size: 1.41 KB

patch

obsolete

>From 57aa4b96dec6d60e14159ea840a49806d1e564ed Mon Sep 17 00:00:00 2001
>From: Daniel Vetter <daniel.vetter@ffwll.ch>
>Date: Tue, 22 Oct 2013 10:41:33 +0200
>Subject: [PATCH] drm/i915: handle faked missed interrupts as simulated hangs,
> too
>
>Otherwise QA will report this as a real hang.
>
>v2: Actually test the right stuff and really shut up the DRM_ERROR
>output ...
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70747
>Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>---
> drivers/gpu/drm/i915/i915_irq.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
>index 1a7dc7754e2f..68936da7c25d 100644
>--- a/drivers/gpu/drm/i915/i915_irq.c
>+++ b/drivers/gpu/drm/i915/i915_irq.c
>@@ -2258,8 +2258,12 @@ static void i915_hangcheck_elapsed(unsigned long data)
> 				if (waitqueue_active(&ring->irq_queue)) {
> 					/* Issue a wake-up to catch stuck h/w. */
> 					if (!test_and_set_bit(ring->id, &dev_priv->gpu_error.missed_irq_rings)) {
>-						DRM_ERROR("Hangcheck timer elapsed... %s idle\n",
>-							  ring->name);
>+						if (!(dev_priv->gpu_error.test_irq_rings & intel_ring_flag(ring)))
>+							DRM_ERROR("Hangcheck timer elapsed... %s idle\n",
>+								  ring->name);
>+						else
>+							DRM_INFO("Fake missed irq on %s\n",
>+								 ring->name);
> 						wake_up_all(&ring->irq_queue);
> 					}
> 					/* Safeguard against driver failure */
>-- 
>1.8.4.rc3
>

Actions: View | Splinter Review

Attachments on bug 70747: 87966 | 87973 | 88192 | 88209

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.