Attachment 59445 Details for Bug 48209 – Trigger hangcheck for repeated "IRQ misses"

[patch] Trigger hangcheck for repeated "IRQ misses"

0001-drm-i915-Trigger-hangcheck-if-we-detect-more-a-repea.patch (text/plain), 3.24 KB, created by Chris Wilson on 2012-04-03 11:36:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2012-04-03 11:36:59 UTC

Size: 3.24 KB

patch

obsolete

>From 7d0a12291036c74a90693db85e678c9b4e253c02 Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Tue, 3 Apr 2012 19:33:14 +0100
>Subject: [PATCH] drm/i915: Trigger hangcheck if we detect more a repeating
> missed IRQ
>
>On the first instance we just wish to kick the waiters and see if that
>terminates the wait conditions. If it does not, then we do not want to
>keep retrying without ever making any forward progress and becoming
>stuck in a hangcheck loop.
>
>Reported-by: Lukas Hejtmanek <xhejtman@fi.muni.cz>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=48209
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>---
> drivers/gpu/drm/i915/i915_irq.c |   63 +++++++++++++++++++++++---------------
> 1 files changed, 38 insertions(+), 25 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
>index 6d76ee5..9e545b8 100644
>--- a/drivers/gpu/drm/i915/i915_irq.c
>+++ b/drivers/gpu/drm/i915/i915_irq.c
>@@ -1874,6 +1874,36 @@ static bool kick_ring(struct intel_ring_buffer *ring)
> 	return false;
> }
> 
>+static bool i915_hangcheck_hung(struct drm_device *dev)
>+{
>+	drm_i915_private_t *dev_priv = dev->dev_private;
>+
>+	if (dev_priv->hangcheck_count++ > 1) {
>+		DRM_ERROR("Hangcheck timer elapsed... GPU hung\n");
>+		i915_handle_error(dev, true);
>+
>+		if (!IS_GEN2(dev)) {
>+			/* Is the chip hanging on a WAIT_FOR_EVENT?
>+			 * If so we can simply poke the RB_WAIT bit
>+			 * and break the hang. This should work on
>+			 * all but the second generation chipsets.
>+			 */
>+			if (kick_ring(&dev_priv->ring[RCS]))
>+				return false;
>+
>+			if (HAS_BSD(dev) && kick_ring(&dev_priv->ring[VCS]))
>+				return false;
>+
>+			if (HAS_BLT(dev) && kick_ring(&dev_priv->ring[BCS]))
>+				return false;
>+		}
>+
>+		return true;
>+	}
>+
>+	return false;
>+}
>+
> /**
>  * This is called when the chip hasn't reported back with completed
>  * batchbuffers in a long time. The first time this is called we simply record
>@@ -1894,9 +1924,14 @@ void i915_hangcheck_elapsed(unsigned long data)
> 	if (i915_hangcheck_ring_idle(&dev_priv->ring[RCS], &err) &&
> 	    i915_hangcheck_ring_idle(&dev_priv->ring[VCS], &err) &&
> 	    i915_hangcheck_ring_idle(&dev_priv->ring[BCS], &err)) {
>-		dev_priv->hangcheck_count = 0;
>-		if (err)
>+		if (err) {
>+			if (i915_hangcheck_hung(dev))
>+				return;
>+
> 			goto repeat;
>+		}
>+
>+		dev_priv->hangcheck_count = 0;
> 		return;
> 	}
> 
>@@ -1918,30 +1953,8 @@ void i915_hangcheck_elapsed(unsigned long data)
> 	    dev_priv->last_acthd_blt == acthd_blt &&
> 	    dev_priv->last_instdone == instdone &&
> 	    dev_priv->last_instdone1 == instdone1) {
>-		if (dev_priv->hangcheck_count++ > 1) {
>-			DRM_ERROR("Hangcheck timer elapsed... GPU hung\n");
>-			i915_handle_error(dev, true);
>-
>-			if (!IS_GEN2(dev)) {
>-				/* Is the chip hanging on a WAIT_FOR_EVENT?
>-				 * If so we can simply poke the RB_WAIT bit
>-				 * and break the hang. This should work on
>-				 * all but the second generation chipsets.
>-				 */
>-				if (kick_ring(&dev_priv->ring[RCS]))
>-					goto repeat;
>-
>-				if (HAS_BSD(dev) &&
>-				    kick_ring(&dev_priv->ring[VCS]))
>-					goto repeat;
>-
>-				if (HAS_BLT(dev) &&
>-				    kick_ring(&dev_priv->ring[BCS]))
>-					goto repeat;
>-			}
>-
>+		if (i915_hangcheck_hung(dev))
> 			return;
>-		}
> 	} else {
> 		dev_priv->hangcheck_count = 0;
> 
>-- 
>1.7.9.1
>

Actions: View | Splinter Review

Attachments on bug 48209: 59396 | 59397 | 59398 | 59445 | 59678

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.