Attachment 35551 Details for Bug 26691 – Include instdone in hangcheck.

[patch] Include instdone in hangcheck.

0001-drm-i915-Include-instdone-1-in-hangcheck.patch (text/plain), 2.70 KB, created by Chris Wilson on 2010-05-10 12:12:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2010-05-10 12:12:47 UTC

Size: 2.70 KB

patch

obsolete

>From d48212da3a3bab17840c01b0d0e7f19763e370eb Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Mon, 10 May 2010 20:10:29 +0100
>Subject: [PATCH] drm/i915: Include instdone[1] in hangcheck
>
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>---
> drivers/gpu/drm/i915/i915_drv.h |    2 ++
> drivers/gpu/drm/i915/i915_irq.c |   38 +++++++++++++++++++++++---------------
> 2 files changed, 25 insertions(+), 15 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
>index 67eac73..82f376a 100644
>--- a/drivers/gpu/drm/i915/i915_drv.h
>+++ b/drivers/gpu/drm/i915/i915_drv.h
>@@ -295,6 +295,8 @@ typedef struct drm_i915_private {
> 	struct timer_list hangcheck_timer;
> 	int hangcheck_count;
> 	uint32_t last_acthd;
>+	uint32_t last_instdone;
>+	uint32_t last_instdone1;
> 
> 	struct drm_mm vram;
> 
>diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
>index a7e4b1f..c54e804 100644
>--- a/drivers/gpu/drm/i915/i915_irq.c
>+++ b/drivers/gpu/drm/i915/i915_irq.c
>@@ -1245,16 +1245,21 @@ void i915_hangcheck_elapsed(unsigned long data)
> {
> 	struct drm_device *dev = (struct drm_device *)data;
> 	drm_i915_private_t *dev_priv = dev->dev_private;
>-	uint32_t acthd;
>+	uint32_t acthd, instdone, instdone1;
> 
> 	/* No reset support on this chip yet. */
> 	if (IS_GEN6(dev))
> 		return;
> 
>-	if (!IS_I965G(dev))
>+	if (!IS_I965G(dev)) {
> 		acthd = I915_READ(ACTHD);
>-	else
>+		instdone = I915_READ(INSTDONE);
>+		instdone1 = 0;
>+	} else {
> 		acthd = I915_READ(ACTHD_I965);
>+		instdone = I915_READ(INSTDONE_I965);
>+		instdone1 = I915_READ(INSTDONE1);
>+	}
> 
> 	/* If all work is done then ACTHD clearly hasn't advanced. */
> 	if (list_empty(&dev_priv->mm.request_list) ||
>@@ -1263,21 +1268,24 @@ void i915_hangcheck_elapsed(unsigned long data)
> 		return;
> 	}
> 
>-	if (dev_priv->last_acthd == acthd && dev_priv->hangcheck_count > 0) {
>-		DRM_ERROR("Hangcheck timer elapsed... GPU hung\n");
>-		i915_handle_error(dev, true);
>-		return;
>-	} 
>+	if (dev_priv->last_acthd == acthd &&
>+	    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);
>+			return;
>+		}
>+	} else {
>+		dev_priv->hangcheck_count = 0;
>+
>+		dev_priv->last_acthd = acthd;
>+		dev_priv->last_instdone = instdone;
>+		dev_priv->last_instdone1 = instdone1;
>+	}
> 
> 	/* Reset timer case chip hangs without another request being added */
> 	mod_timer(&dev_priv->hangcheck_timer, jiffies + DRM_I915_HANGCHECK_PERIOD);
>-
>-	if (acthd != dev_priv->last_acthd)
>-		dev_priv->hangcheck_count = 0;
>-	else
>-		dev_priv->hangcheck_count++;
>-
>-	dev_priv->last_acthd = acthd;
> }
> 
> /* drm_dma.h hooks
>-- 
>1.7.1
>

Actions: View | Splinter Review

Attachments on bug 26691: 33479 | 33480 | 33481 | 33482 | 35551

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.