[PATCH] drm/i915: handle faked missed interrupts as simulated hangs, too

[PATCH] drm/i915: handle faked missed interrupts as simulated hangs, too

[Daniel Vetter]

Otherwise QA will report this as a real hang when running igt
ZZ_missed_irq.

v2: Actually test the right stuff and really shut up the DRM_ERROR
output ...

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70747
Tested-by: lu hua <huax.lu@intel.com>
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

Re: [PATCH] drm/i915: handle faked missed interrupts as simulated hangs, too

[Daniel Vetter]

On Mon, Oct 28, 2013 at 09:24:13AM +0100, Daniel Vetter wrote:
> Otherwise QA will report this as a real hang when running igt
> ZZ_missed_irq.
> 
> v2: Actually test the right stuff and really shut up the DRM_ERROR
> output ...
> 
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70747
> Tested-by: lu hua <huax.lu@intel.com>
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Merged with Chris' irc-ack.
-Daniel

> ---
>  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
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch