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

Commit 27399eee authored by Chris Wilson's avatar Chris Wilson Committed by Jani Nikula
Browse files

drm/i915: Use correct index for backtracking HUNG semaphores 



When decoding the semaphores inside hangcheck, we need to use the hw-id
and not the local array index.

Fixes: de1add36 ("drm/i915: Decouple execbuf uAPI ...")
Testcase: igt/gem_exec_whisper/hang # gen6-7
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: stable@vger.kernel.org
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161003124516.12388-3-chris@chris-wilson.co.uk


(cherry picked from commit 348b9b1192144e13b779f8f9be301d492bebaff2)
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent ca5732c5

drivers/gpu/drm/i915/i915_irq.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -2822,7 +2822,7 @@ semaphore_wait_to_signaller_ring(struct intel_engine_cs *engine, u32 ipehr, 
			if (engine == signaller)

			if (engine == signaller)

				continue;

				continue;





			if (offset == signaller->semaphore.signal_ggtt[engine->id])

			if (offset == signaller->semaphore.signal_ggtt[engine->hw_id])

				return signaller;

				return signaller;

		}

		}

	} else {

	} else {
@@ -2832,13 +2832,13 @@ semaphore_wait_to_signaller_ring(struct intel_engine_cs *engine, u32 ipehr, 
			if(engine == signaller)

			if(engine == signaller)

				continue;

				continue;





			if (sync_bits == signaller->semaphore.mbox.wait[engine->id])

			if (sync_bits == signaller->semaphore.mbox.wait[engine->hw_id])

				return signaller;

				return signaller;

		}

		}

	}

	}





	DRM_DEBUG_DRIVER("No signaller ring found for ring %i, ipehr 0x%08x, offset 0x%016llx\n",

	DRM_DEBUG_DRIVER("No signaller ring found for %s, ipehr 0x%08x, offset 0x%016llx\n",

			 engine->id, ipehr, offset);

			 engine->name, ipehr, offset);





	return ERR_PTR(-ENODEV);

	return ERR_PTR(-ENODEV);

}

}