All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915: Use correct index for backtracking HUNG semaphores
@ 2016-10-01 19:42 ` Chris Wilson
  0 siblings, 0 replies; 4+ messages in thread
From: Chris Wilson @ 2016-10-01 19:42 UTC (permalink / raw)
  To: intel-gfx
  Cc: Chris Wilson, Mika Kuoppala, Tvrtko Ursulin, Daniel Vetter, stable

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 <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
---
 drivers/gpu/drm/i915/i915_irq.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 6ed5b240ee06..238a353454e9 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -2877,7 +2877,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 {
@@ -2887,13 +2887,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);
 }
-- 
2.9.3


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [PATCH] drm/i915: Use correct index for backtracking HUNG semaphores
@ 2016-10-01 19:42 ` Chris Wilson
  0 siblings, 0 replies; 4+ messages in thread
From: Chris Wilson @ 2016-10-01 19:42 UTC (permalink / raw)
  To: intel-gfx; +Cc: Daniel Vetter, Mika Kuoppala, stable

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 <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
---
 drivers/gpu/drm/i915/i915_irq.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 6ed5b240ee06..238a353454e9 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -2877,7 +2877,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 {
@@ -2887,13 +2887,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);
 }
-- 
2.9.3

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* ✗ Fi.CI.BAT: failure for drm/i915: Use correct index for backtracking HUNG semaphores
  2016-10-01 19:42 ` Chris Wilson
  (?)
@ 2016-10-01 20:28 ` Patchwork
  -1 siblings, 0 replies; 4+ messages in thread
From: Patchwork @ 2016-10-01 20:28 UTC (permalink / raw)
  To: Chris Wilson; +Cc: intel-gfx

== Series Details ==

Series: drm/i915: Use correct index for backtracking HUNG semaphores
URL   : https://patchwork.freedesktop.org/series/13194/
State : failure

== Summary ==

Series 13194v1 drm/i915: Use correct index for backtracking HUNG semaphores
https://patchwork.freedesktop.org/api/1.0/series/13194/revisions/1/mbox/

Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-a:
                pass       -> DMESG-WARN (fi-byt-j1900)
Test vgem_basic:
        Subgroup second-client:
                pass       -> INCOMPLETE (fi-snb-2600)

fi-bxt-t5700     total:236  pass:205  dwarn:0   dfail:0   fail:0   skip:30 
fi-byt-j1900     total:245  pass:211  dwarn:1   dfail:0   fail:2   skip:31 
fi-byt-n2820     total:245  pass:208  dwarn:0   dfail:0   fail:2   skip:35 
fi-hsw-4770      total:236  pass:213  dwarn:0   dfail:0   fail:0   skip:22 
fi-ilk-650       total:245  pass:182  dwarn:0   dfail:0   fail:3   skip:60 
fi-skl-6770hq    total:236  pass:219  dwarn:1   dfail:0   fail:1   skip:14 
fi-snb-2520m     total:245  pass:208  dwarn:0   dfail:0   fail:1   skip:36 
fi-snb-2600      total:237  pass:198  dwarn:0   dfail:0   fail:1   skip:37 
fi-bdw-5557u failed to collect. IGT log at Patchwork_2610/fi-bdw-5557u/igt.log
fi-bsw-n3050 failed to collect. IGT log at Patchwork_2610/fi-bsw-n3050/igt.log
fi-hsw-4770r failed to collect. IGT log at Patchwork_2610/fi-hsw-4770r/igt.log
fi-ivb-3520m failed to collect. IGT log at Patchwork_2610/fi-ivb-3520m/igt.log
fi-ivb-3770 failed to collect. IGT log at Patchwork_2610/fi-ivb-3770/igt.log
fi-skl-6260u failed to collect. IGT log at Patchwork_2610/fi-skl-6260u/igt.log
fi-skl-6700hq failed to collect. IGT log at Patchwork_2610/fi-skl-6700hq/igt.log
fi-skl-6700k failed to collect. IGT log at Patchwork_2610/fi-skl-6700k/igt.log

Results at /archive/results/CI_IGT_test/Patchwork_2610/

d0534bd0217c83c083ba146b9c987e19b219e0e4 drm-intel-nightly: 2016y-09m-30d-10h-31m-00s UTC integration manifest
1d935d3 drm/i915: Use correct index for backtracking HUNG semaphores

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915: Use correct index for backtracking HUNG semaphores
  2016-10-01 19:42 ` Chris Wilson
  (?)
  (?)
@ 2016-10-03  7:19 ` Joonas Lahtinen
  -1 siblings, 0 replies; 4+ messages in thread
From: Joonas Lahtinen @ 2016-10-03  7:19 UTC (permalink / raw)
  To: Chris Wilson, intel-gfx; +Cc: Daniel Vetter, Mika Kuoppala, stable

On la, 2016-10-01 at 20:42 +0100, Chris Wilson wrote:
> 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 <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: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>

Regards, Joonas
-- 
Joonas Lahtinen
Open Source Technology Center
Intel Corporation

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-10-03  7:19 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-01 19:42 [PATCH] drm/i915: Use correct index for backtracking HUNG semaphores Chris Wilson
2016-10-01 19:42 ` Chris Wilson
2016-10-01 20:28 ` ✗ Fi.CI.BAT: failure for " Patchwork
2016-10-03  7:19 ` [Intel-gfx] [PATCH] " Joonas Lahtinen

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.