* [PATCH] drm/i915: Move hangcheck reset from out of the engines into the GPU reset
@ 2016-07-14 11:56 Chris Wilson
2016-07-14 12:31 ` ✗ Ro.CI.BAT: failure for " Patchwork
2016-07-14 13:59 ` [PATCH] " Mika Kuoppala
0 siblings, 2 replies; 4+ messages in thread
From: Chris Wilson @ 2016-07-14 11:56 UTC (permalink / raw)
To: intel-gfx; +Cc: Mika Kuoppala
Let's not reset the hangcheck as a side-effect of initialising the
engine, but as part of our GPU reset.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Cc: Arun Siluvery <arun.siluvery@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
drivers/gpu/drm/i915/i915_gem.c | 1 +
drivers/gpu/drm/i915/intel_lrc.c | 2 --
drivers/gpu/drm/i915/intel_ringbuffer.c | 2 --
3 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index b788f97cd4cf..978fa6f6f747 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3169,6 +3169,7 @@ static void i915_gem_reset_engine_cleanup(struct intel_engine_cs *engine)
}
intel_ring_init_seqno(engine, engine->last_submitted_seqno);
+ intel_engine_init_hangcheck(engine);
}
void i915_gem_reset(struct drm_device *dev)
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index b6af635e3a0f..377cfbfb71fd 100644
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -1529,8 +1529,6 @@ static int gen8_init_common_ring(struct intel_engine_cs *engine)
engine->next_context_status_buffer = next_context_status_buffer_hw;
DRM_DEBUG_DRIVER("Execlists enabled for %s\n", engine->name);
- intel_engine_init_hangcheck(engine);
-
return intel_mocs_init_engine(engine);
}
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 94c8ef461721..8a9e035341a9 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -627,8 +627,6 @@ static int init_ring_common(struct intel_engine_cs *engine)
ringbuf->tail = I915_READ_TAIL(engine) & TAIL_ADDR;
intel_ring_update_space(ringbuf);
- intel_engine_init_hangcheck(engine);
-
out:
intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
--
2.8.1
_______________________________________________
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
* ✗ Ro.CI.BAT: failure for drm/i915: Move hangcheck reset from out of the engines into the GPU reset
2016-07-14 11:56 [PATCH] drm/i915: Move hangcheck reset from out of the engines into the GPU reset Chris Wilson
@ 2016-07-14 12:31 ` Patchwork
2016-07-14 13:59 ` [PATCH] " Mika Kuoppala
1 sibling, 0 replies; 4+ messages in thread
From: Patchwork @ 2016-07-14 12:31 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Move hangcheck reset from out of the engines into the GPU reset
URL : https://patchwork.freedesktop.org/series/9871/
State : failure
== Summary ==
Series 9871v1 drm/i915: Move hangcheck reset from out of the engines into the GPU reset
http://patchwork.freedesktop.org/api/1.0/series/9871/revisions/1/mbox
Test drv_getparams_basic:
Subgroup basic-eu-total:
pass -> SKIP (fi-skl-i5-6260u)
Subgroup basic-subslice-total:
pass -> SKIP (fi-skl-i5-6260u)
Test drv_hangman:
Subgroup error-state-basic:
pass -> SKIP (fi-skl-i5-6260u)
Test drv_module_reload_basic:
dmesg-warn -> TIMEOUT (fi-skl-i5-6260u)
Test gem_basic:
Subgroup bad-close:
pass -> SKIP (fi-skl-i5-6260u)
Subgroup create-close:
pass -> SKIP (fi-skl-i5-6260u)
Subgroup create-fd-close:
pass -> SKIP (fi-skl-i5-6260u)
Test gem_busy:
Subgroup basic-blt:
pass -> SKIP (fi-skl-i5-6260u)
Subgroup basic-bsd:
pass -> SKIP (fi-skl-i5-6260u)
Subgroup basic-bsd1:
pass -> SKIP (fi-skl-i5-6260u)
Subgroup basic-bsd2:
pass -> SKIP (fi-skl-i5-6260u)
Subgroup basic-parallel-blt:
pass -> SKIP (fi-skl-i5-6260u)
Subgroup basic-parallel-bsd:
pass -> SKIP (fi-skl-i5-6260u)
Subgroup basic-parallel-bsd1:
pass -> SKIP (fi-skl-i5-6260u)
Subgroup basic-parallel-bsd2:
pass -> SKIP (fi-skl-i5-6260u)
Subgroup basic-parallel-render:
pass -> SKIP (fi-skl-i5-6260u)
Subgroup basic-parallel-vebox:
pass -> SKIP (fi-skl-i5-6260u)
Subgroup basic-render:
pass -> SKIP (fi-skl-i5-6260u)
Subgroup basic-vebox:
pass -> SKIP (fi-skl-i5-6260u)
Test gem_close_race:
Subgroup basic-process:
pass -> SKIP (fi-skl-i5-6260u)
Subgroup basic-threads:
pass -> SKIP (fi-skl-i5-6260u)
Test gem_cs_tlb:
Subgroup basic-default:
pass -> SKIP (fi-skl-i5-6260u)
Test gem_ctx_exec:
Subgroup basic:
pass -> SKIP (fi-skl-i5-6260u)
Test gem_ctx_param:
Subgroup basic:
pass -> SKIP (fi-skl-i5-6260u)
Subgroup basic-default:
pass -> SKIP (fi-skl-i5-6260u)
Test gem_exec_basic:
Subgroup basic-blt:
pass -> SKIP (fi-skl-i5-6260u)
Subgroup basic-bsd:
pass -> SKIP (fi-skl-i5-6260u)
Subgroup basic-bsd1:
pass -> SKIP (fi-skl-i5-6260u)
Subgroup basic-bsd2:
pass -> SKIP (fi-skl-i5-6260u)
Subgroup basic-default:
pass -> SKIP (fi-skl-i5-6260u)
Subgroup basic-render:
pass -> SKIP (fi-skl-i5-6260u)
Subgroup basic-vebox:
pass -> SKIP (fi-skl-i5-6260u)
Subgroup gtt-blt:
pass -> SKIP (fi-skl-i5-6260u)
Subgroup gtt-bsd:
pass -> SKIP (fi-skl-i5-6260u)
Subgroup gtt-bsd1:
pass -> SKIP (fi-skl-i5-6260u)
Subgroup gtt-bsd2:
pass -> SKIP (fi-skl-i5-6260u)
Subgroup gtt-default:
pass -> SKIP (fi-skl-i5-6260u)
Subgroup gtt-render:
pass -> SKIP (fi-skl-i5-6260u)
Subgroup gtt-vebox:
pass -> SKIP (fi-skl-i5-6260u)
Subgroup readonly-blt:
pass -> SKIP (fi-skl-i5-6260u)
Subgroup readonly-bsd:
pass -> SKIP (fi-skl-i5-6260u)
Subgroup readonly-bsd1:
pass -> SKIP (fi-skl-i5-6260u)
Subgroup readonly-bsd2:
pass -> SKIP (fi-skl-i5-6260u)
Subgroup readonly-default:
pass -> SKIP (fi-skl-i5-6260u)
WARNING: Long output truncated
Results at /archive/results/CI_IGT_test/RO_Patchwork_1491/
c504630 drm-intel-nightly: 2016y-07m-14d-10h-18m-17s UTC integration manifest
9f5f1b2 drm/i915: Move hangcheck reset from out of the engines into the GPU reset
_______________________________________________
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: [PATCH] drm/i915: Move hangcheck reset from out of the engines into the GPU reset
2016-07-14 11:56 [PATCH] drm/i915: Move hangcheck reset from out of the engines into the GPU reset Chris Wilson
2016-07-14 12:31 ` ✗ Ro.CI.BAT: failure for " Patchwork
@ 2016-07-14 13:59 ` Mika Kuoppala
2016-07-14 14:11 ` Chris Wilson
1 sibling, 1 reply; 4+ messages in thread
From: Mika Kuoppala @ 2016-07-14 13:59 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
Chris Wilson <chris@chris-wilson.co.uk> writes:
> Let's not reset the hangcheck as a side-effect of initialising the
> engine, but as part of our GPU reset.
>
I think TDR will need both the init and the reset.
-Mika
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Mika Kuoppala <mika.kuoppala@intel.com>
> Cc: Arun Siluvery <arun.siluvery@linux.intel.com>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> ---
> drivers/gpu/drm/i915/i915_gem.c | 1 +
> drivers/gpu/drm/i915/intel_lrc.c | 2 --
> drivers/gpu/drm/i915/intel_ringbuffer.c | 2 --
> 3 files changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index b788f97cd4cf..978fa6f6f747 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -3169,6 +3169,7 @@ static void i915_gem_reset_engine_cleanup(struct intel_engine_cs *engine)
> }
>
> intel_ring_init_seqno(engine, engine->last_submitted_seqno);
> + intel_engine_init_hangcheck(engine);
> }
>
> void i915_gem_reset(struct drm_device *dev)
> diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
> index b6af635e3a0f..377cfbfb71fd 100644
> --- a/drivers/gpu/drm/i915/intel_lrc.c
> +++ b/drivers/gpu/drm/i915/intel_lrc.c
> @@ -1529,8 +1529,6 @@ static int gen8_init_common_ring(struct intel_engine_cs *engine)
> engine->next_context_status_buffer = next_context_status_buffer_hw;
> DRM_DEBUG_DRIVER("Execlists enabled for %s\n", engine->name);
>
> - intel_engine_init_hangcheck(engine);
> -
> return intel_mocs_init_engine(engine);
> }
>
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
> index 94c8ef461721..8a9e035341a9 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
> @@ -627,8 +627,6 @@ static int init_ring_common(struct intel_engine_cs *engine)
> ringbuf->tail = I915_READ_TAIL(engine) & TAIL_ADDR;
> intel_ring_update_space(ringbuf);
>
> - intel_engine_init_hangcheck(engine);
> -
> out:
> intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
>
> --
> 2.8.1
_______________________________________________
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: [PATCH] drm/i915: Move hangcheck reset from out of the engines into the GPU reset
2016-07-14 13:59 ` [PATCH] " Mika Kuoppala
@ 2016-07-14 14:11 ` Chris Wilson
0 siblings, 0 replies; 4+ messages in thread
From: Chris Wilson @ 2016-07-14 14:11 UTC (permalink / raw)
To: Mika Kuoppala; +Cc: intel-gfx
On Thu, Jul 14, 2016 at 04:59:56PM +0300, Mika Kuoppala wrote:
> Chris Wilson <chris@chris-wilson.co.uk> writes:
>
> > Let's not reset the hangcheck as a side-effect of initialising the
> > engine, but as part of our GPU reset.
> >
>
> I think TDR will need both the init and the reset.
It doesn't. This state is the purely global state for hangcheck. There's
probably a better spot, such as hangcheck expiration, but at the moment
this is better. TDR will be keeping its own data structures and should
not stop the global hangcheck from stepping in and saying enough is
enough.
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
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
end of thread, other threads:[~2016-07-14 14:12 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-14 11:56 [PATCH] drm/i915: Move hangcheck reset from out of the engines into the GPU reset Chris Wilson
2016-07-14 12:31 ` ✗ Ro.CI.BAT: failure for " Patchwork
2016-07-14 13:59 ` [PATCH] " Mika Kuoppala
2016-07-14 14:11 ` Chris Wilson
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.