Attachment 38571 Details for Bug 30073 – check the wait request is still pending before generating an error.

[patch] check the wait request is still pending before generating an error.

0001-drm-i915-Double-check-that-the-wait_request-is-not-p.patch (text/plain), 2.08 KB, created by Chris Wilson on 2010-09-08 16:03:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2010-09-08 16:03:57 UTC

Size: 2.08 KB

patch

obsolete

>From c0fb2ac714d3f9b676bee7e3faeb293e43afce09 Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Thu, 9 Sep 2010 00:02:03 +0100
>Subject: [PATCH] drm/i915: Double check that the wait_request is not pending before warning
>
>If we are busy, then we may have woken up the wait_request handler but
>not yet serviced it before the hang check fires. So in hang check,
>double check that the i915_gem_do_wait_request() is still pending the
>wake-up before declaring all hope lost.
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=30073
>Reported-by: Sitsofe Wheeler <sitsofe@yahoo.com>
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>---
> drivers/gpu/drm/i915/i915_irq.c |   22 +++++++++++++++-------
> 1 files changed, 15 insertions(+), 7 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
>index 59457e8..744225e 100644
>--- a/drivers/gpu/drm/i915/i915_irq.c
>+++ b/drivers/gpu/drm/i915/i915_irq.c
>@@ -1350,17 +1350,25 @@ void i915_hangcheck_elapsed(unsigned long data)
> 		i915_seqno_passed(i915_get_gem_seqno(dev,
> 				&dev_priv->render_ring),
> 			i915_get_tail_request(dev)->seqno)) {
>+		bool missed_wakeup = false;
>+
> 		dev_priv->hangcheck_count = 0;
> 
> 		/* Issue a wake-up to catch stuck h/w. */
>-		if (dev_priv->render_ring.waiting_gem_seqno |
>-		    dev_priv->bsd_ring.waiting_gem_seqno) {
>-			DRM_ERROR("Hangcheck timer elapsed... GPU idle, missed IRQ.\n");
>-			if (dev_priv->render_ring.waiting_gem_seqno)
>-				DRM_WAKEUP(&dev_priv->render_ring.irq_queue);
>-			if (dev_priv->bsd_ring.waiting_gem_seqno)
>-				DRM_WAKEUP(&dev_priv->bsd_ring.irq_queue);
>+		if (dev_priv->render_ring.waiting_gem_seqno &&
>+		    waitqueue_active(&dev_priv->render_ring.irq_queue)) {
>+			DRM_WAKEUP(&dev_priv->render_ring.irq_queue);
>+			missed_wakeup = true;
>+		}
>+
>+		if (dev_priv->bsd_ring.waiting_gem_seqno &&
>+		    waitqueue_active(&dev_priv->bsd_ring.irq_queue)) {
>+			DRM_WAKEUP(&dev_priv->bsd_ring.irq_queue);
>+			missed_wakeup = true;
> 		}
>+
>+		if (missed_wakeup)
>+			DRM_ERROR("Hangcheck timer elapsed... GPU idle, missed IRQ.\n");
> 		return;
> 	}
> 
>-- 
>1.7.1
>

Actions: View | Splinter Review

Attachments on bug 30073: 38571

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.