Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4adcd24 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

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

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: default avatarlu hua <huax.lu@intel.com>
Acked-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent ddb642fb

drivers/gpu/drm/i915/i915_irq.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -2258,8 +2258,12 @@ static void i915_hangcheck_elapsed(unsigned long data) 
				if (waitqueue_active(&ring->irq_queue)) {

				if (waitqueue_active(&ring->irq_queue)) {

					/* Issue a wake-up to catch stuck h/w. */

					/* Issue a wake-up to catch stuck h/w. */

					if (!test_and_set_bit(ring->id, &dev_priv->gpu_error.missed_irq_rings)) {

					if (!test_and_set_bit(ring->id, &dev_priv->gpu_error.missed_irq_rings)) {

						if (!(dev_priv->gpu_error.test_irq_rings & intel_ring_flag(ring)))

							DRM_ERROR("Hangcheck timer elapsed... %s idle\n",

							DRM_ERROR("Hangcheck timer elapsed... %s idle\n",

								  ring->name);

								  ring->name);

						else

							DRM_INFO("Fake missed irq on %s\n",

								 ring->name);

						wake_up_all(&ring->irq_queue);

						wake_up_all(&ring->irq_queue);

					}

					}

					/* Safeguard against driver failure */

					/* Safeguard against driver failure */