FAILED: patch "[PATCH] drm/i915: Use correct index for backtracking HUNG semaphores" failed to apply to 4.8-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 4.8-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
27399eeec28ff33a0c5216a80cf57cbc6ba3c15eMon Sep 17 00:00:00 2001
From: Chris Wilson <[email protected]>
Date: Mon, 3 Oct 2016 13:45:16 +0100
Subject: [PATCH] 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 de1add360522 ("drm/i915: Decouple execbuf uAPI ...")
Testcase: igt/gem_exec_whisper/hang # gen6-7
Signed-off-by Chris Wilson <[email protected]>
Cc Mika Kuoppala <[email protected]>
Cc Tvrtko Ursulin <[email protected]>
Cc Daniel Vetter <[email protected]>
Reviewed-by Joonas Lahtinen <[email protected]>
(cherry picked from commit 348b9b1192144e13b779f8f9be301d492bebaff2)
Signed-off-by Jani Nikula <[email protected]>
drivers/gpu/drm/i915/i915_irq.c +4 -4
@@ -2822,7 +2822,7 @@ semaphore_wait_to_signaller_ring(struct intel_engine_cs *engine, u32 ipehr,if (engine == signaller)continue ; -if (offset == signaller->semaphore.signal_ggtt[engine->id]) +if (offset == signaller->semaphore.signal_ggtt[engine->hw_id])return signaller; } }else {
@@ -2832,13 +2832,13 @@ semaphore_wait_to_signaller_ring(struct intel_engine_cs *engine, u32 ipehr,if (engine == signaller)continue ; -if (sync_bits == signaller->semaphore.mbox.wait[engine->id]) +if (sync_bits == signaller->semaphore.mbox.wait[engine->hw_id])return signaller; } } -DRM_DEBUG_DRIVER ("No signaller ring found for ring %i, ipehr 0x%08x, offset 0x%016llx\n" , - engine->id, ipehr, offset); +DRM_DEBUG_DRIVER ("No signaller ring found for %s, ipehr 0x%08x, offset 0x%016llx\n" , + engine->name, ipehr, offset);return ERR_PTR (-ENODEV ); }