* [Intel-gfx] [PATCH] drm/i915/gt: Confirm the context survives execution
@ 2020-10-13 15:35 Chris Wilson
2020-10-13 16:20 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for " Patchwork
` (4 more replies)
0 siblings, 5 replies; 11+ messages in thread
From: Chris Wilson @ 2020-10-13 15:35 UTC (permalink / raw)
To: intel-gfx; +Cc: Chris Wilson
Repeat our sanitychecks from before execution to after execution. One
expects that if we were to see these, the gpu would already be on fire,
but the timing may be informative.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/gt/intel_lrc.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c
index 287537089c77..3dbdd5d0cb60 100644
--- a/drivers/gpu/drm/i915/gt/intel_lrc.c
+++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
@@ -1216,7 +1216,8 @@ static void intel_engine_context_out(struct intel_engine_cs *engine)
static void
execlists_check_context(const struct intel_context *ce,
- const struct intel_engine_cs *engine)
+ const struct intel_engine_cs *engine,
+ const char *when)
{
const struct intel_ring *ring = ce->ring;
u32 *regs = ce->lrc_reg_state;
@@ -1251,7 +1252,7 @@ execlists_check_context(const struct intel_context *ce,
valid = false;
}
- WARN_ONCE(!valid, "Invalid lrc state found before submission\n");
+ WARN_ONCE(!valid, "Invalid lrc state found %s submission\n", when);
}
static void restore_default_state(struct intel_context *ce,
@@ -1347,7 +1348,7 @@ __execlists_schedule_in(struct i915_request *rq)
reset_active(rq, engine);
if (IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM))
- execlists_check_context(ce, engine);
+ execlists_check_context(ce, engine, "before");
if (ce->tag) {
/* Use a fixed tag for OA and friends */
@@ -1418,6 +1419,9 @@ __execlists_schedule_out(struct i915_request *rq,
* refrain from doing non-trivial work here.
*/
+ if (IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM))
+ execlists_check_context(ce, engine, "after");
+
/*
* If we have just completed this context, the engine may now be
* idle and we want to re-enter powersaving.
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915/gt: Confirm the context survives execution
2020-10-13 15:35 [Intel-gfx] [PATCH] drm/i915/gt: Confirm the context survives execution Chris Wilson
@ 2020-10-13 16:20 ` Patchwork
2020-10-14 8:36 ` [Intel-gfx] [PATCH] " Tvrtko Ursulin
` (3 subsequent siblings)
4 siblings, 0 replies; 11+ messages in thread
From: Patchwork @ 2020-10-13 16:20 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 8750 bytes --]
== Series Details ==
Series: drm/i915/gt: Confirm the context survives execution
URL : https://patchwork.freedesktop.org/series/82633/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_9136 -> Patchwork_18689
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_18689 absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_18689, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18689/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_18689:
### IGT changes ###
#### Possible regressions ####
* igt@gem_exec_suspend@basic-s0:
- fi-cfl-guc: [PASS][1] -> [INCOMPLETE][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9136/fi-cfl-guc/igt@gem_exec_suspend@basic-s0.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18689/fi-cfl-guc/igt@gem_exec_suspend@basic-s0.html
* igt@gem_sync@basic-all:
- fi-cml-u2: [PASS][3] -> [INCOMPLETE][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9136/fi-cml-u2/igt@gem_sync@basic-all.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18689/fi-cml-u2/igt@gem_sync@basic-all.html
- fi-cfl-8109u: [PASS][5] -> [INCOMPLETE][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9136/fi-cfl-8109u/igt@gem_sync@basic-all.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18689/fi-cfl-8109u/igt@gem_sync@basic-all.html
* igt@i915_selftest@live@gem_contexts:
- fi-glk-dsi: [PASS][7] -> [INCOMPLETE][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9136/fi-glk-dsi/igt@i915_selftest@live@gem_contexts.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18689/fi-glk-dsi/igt@i915_selftest@live@gem_contexts.html
* igt@i915_selftest@live@hugepages:
- fi-skl-guc: [PASS][9] -> [INCOMPLETE][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9136/fi-skl-guc/igt@i915_selftest@live@hugepages.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18689/fi-skl-guc/igt@i915_selftest@live@hugepages.html
#### Warnings ####
* igt@gem_exec_suspend@basic-s3:
- fi-kbl-guc: [DMESG-WARN][11] ([i915#2203]) -> [INCOMPLETE][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9136/fi-kbl-guc/igt@gem_exec_suspend@basic-s3.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18689/fi-kbl-guc/igt@gem_exec_suspend@basic-s3.html
Known issues
------------
Here are the changes found in Patchwork_18689 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_suspend@basic-s3:
- fi-apl-guc: [PASS][13] -> [INCOMPLETE][14] ([i915#1635])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9136/fi-apl-guc/igt@gem_exec_suspend@basic-s3.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18689/fi-apl-guc/igt@gem_exec_suspend@basic-s3.html
* igt@i915_module_load@reload:
- fi-tgl-u2: [PASS][15] -> [DMESG-WARN][16] ([i915#1982] / [k.org#205379])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9136/fi-tgl-u2/igt@i915_module_load@reload.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18689/fi-tgl-u2/igt@i915_module_load@reload.html
* igt@i915_pm_rpm@basic-pci-d3-state:
- fi-bsw-kefka: [PASS][17] -> [DMESG-WARN][18] ([i915#1982])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9136/fi-bsw-kefka/igt@i915_pm_rpm@basic-pci-d3-state.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18689/fi-bsw-kefka/igt@i915_pm_rpm@basic-pci-d3-state.html
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- fi-bsw-n3050: [PASS][19] -> [DMESG-WARN][20] ([i915#1982])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9136/fi-bsw-n3050/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18689/fi-bsw-n3050/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
- fi-icl-u2: [PASS][21] -> [DMESG-WARN][22] ([i915#1982]) +1 similar issue
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9136/fi-icl-u2/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18689/fi-icl-u2/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy.html
#### Possible fixes ####
* igt@i915_pm_rpm@basic-pci-d3-state:
- fi-bsw-n3050: [DMESG-WARN][23] ([i915#1982]) -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9136/fi-bsw-n3050/igt@i915_pm_rpm@basic-pci-d3-state.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18689/fi-bsw-n3050/igt@i915_pm_rpm@basic-pci-d3-state.html
* igt@kms_busy@basic@flip:
- {fi-kbl-7560u}: [DMESG-WARN][25] ([i915#1982]) -> [PASS][26] +1 similar issue
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9136/fi-kbl-7560u/igt@kms_busy@basic@flip.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18689/fi-kbl-7560u/igt@kms_busy@basic@flip.html
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- fi-bsw-kefka: [DMESG-WARN][27] ([i915#1982]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9136/fi-bsw-kefka/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18689/fi-bsw-kefka/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html
* igt@kms_cursor_legacy@basic-flip-before-cursor-legacy:
- fi-icl-u2: [DMESG-WARN][29] ([i915#1982]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9136/fi-icl-u2/igt@kms_cursor_legacy@basic-flip-before-cursor-legacy.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18689/fi-icl-u2/igt@kms_cursor_legacy@basic-flip-before-cursor-legacy.html
* igt@kms_pipe_crc_basic@read-crc-pipe-b:
- fi-tgl-y: [DMESG-WARN][31] ([i915#1982]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9136/fi-tgl-y/igt@kms_pipe_crc_basic@read-crc-pipe-b.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18689/fi-tgl-y/igt@kms_pipe_crc_basic@read-crc-pipe-b.html
#### Warnings ####
* igt@gem_exec_suspend@basic-s3:
- fi-tgl-y: [DMESG-WARN][33] ([i915#2411] / [i915#402]) -> [DMESG-WARN][34] ([i915#2411])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9136/fi-tgl-y/igt@gem_exec_suspend@basic-s3.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18689/fi-tgl-y/igt@gem_exec_suspend@basic-s3.html
* igt@kms_frontbuffer_tracking@basic:
- fi-tgl-y: [FAIL][35] -> [DMESG-FAIL][36] ([i915#1982])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9136/fi-tgl-y/igt@kms_frontbuffer_tracking@basic.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18689/fi-tgl-y/igt@kms_frontbuffer_tracking@basic.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2203]: https://gitlab.freedesktop.org/drm/intel/issues/2203
[i915#2411]: https://gitlab.freedesktop.org/drm/intel/issues/2411
[i915#289]: https://gitlab.freedesktop.org/drm/intel/issues/289
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
[k.org#205379]: https://bugzilla.kernel.org/show_bug.cgi?id=205379
Participating hosts (47 -> 41)
------------------------------
Missing (6): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-byt-clapper fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_9136 -> Patchwork_18689
CI-20190529: 20190529
CI_DRM_9136: 29eb1a8ba2cc0d14d3cae7213f9cdaaa13f3dd99 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5813: d4e6dd955a1dad02271aa41c9389f5097ee17765 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18689: a03cdf3c5d8ba1527fbbd6bd5f8547667f003ba2 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
a03cdf3c5d8b drm/i915/gt: Confirm the context survives execution
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18689/index.html
[-- Attachment #1.2: Type: text/html, Size: 10439 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/gt: Confirm the context survives execution
2020-10-13 15:35 [Intel-gfx] [PATCH] drm/i915/gt: Confirm the context survives execution Chris Wilson
2020-10-13 16:20 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for " Patchwork
@ 2020-10-14 8:36 ` Tvrtko Ursulin
2020-10-14 8:43 ` Chris Wilson
2020-10-14 8:43 ` Chris Wilson
` (2 subsequent siblings)
4 siblings, 1 reply; 11+ messages in thread
From: Tvrtko Ursulin @ 2020-10-14 8:36 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
On 13/10/2020 16:35, Chris Wilson wrote:
> Repeat our sanitychecks from before execution to after execution. One
> expects that if we were to see these, the gpu would already be on fire,
> but the timing may be informative.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> ---
> drivers/gpu/drm/i915/gt/intel_lrc.c | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c
> index 287537089c77..3dbdd5d0cb60 100644
> --- a/drivers/gpu/drm/i915/gt/intel_lrc.c
> +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
> @@ -1216,7 +1216,8 @@ static void intel_engine_context_out(struct intel_engine_cs *engine)
>
> static void
> execlists_check_context(const struct intel_context *ce,
> - const struct intel_engine_cs *engine)
> + const struct intel_engine_cs *engine,
> + const char *when)
> {
> const struct intel_ring *ring = ce->ring;
> u32 *regs = ce->lrc_reg_state;
> @@ -1251,7 +1252,7 @@ execlists_check_context(const struct intel_context *ce,
> valid = false;
> }
>
> - WARN_ONCE(!valid, "Invalid lrc state found before submission\n");
> + WARN_ONCE(!valid, "Invalid lrc state found %s submission\n", when);
> }
>
> static void restore_default_state(struct intel_context *ce,
> @@ -1347,7 +1348,7 @@ __execlists_schedule_in(struct i915_request *rq)
> reset_active(rq, engine);
>
> if (IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM))
> - execlists_check_context(ce, engine);
> + execlists_check_context(ce, engine, "before");
>
> if (ce->tag) {
> /* Use a fixed tag for OA and friends */
> @@ -1418,6 +1419,9 @@ __execlists_schedule_out(struct i915_request *rq,
> * refrain from doing non-trivial work here.
> */
>
> + if (IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM))
> + execlists_check_context(ce, engine, "after");
> +
CI failures here are either something super scary or a simple mistake
which I cannot see. Or is engine retire, possible queued up before,
racing with current schedule_out?
Regards,
Tvrtko
> /*
> * If we have just completed this context, the engine may now be
> * idle and we want to re-enter powersaving.
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/gt: Confirm the context survives execution
2020-10-14 8:36 ` [Intel-gfx] [PATCH] " Tvrtko Ursulin
@ 2020-10-14 8:43 ` Chris Wilson
2020-10-14 9:06 ` Tvrtko Ursulin
0 siblings, 1 reply; 11+ messages in thread
From: Chris Wilson @ 2020-10-14 8:43 UTC (permalink / raw)
To: Tvrtko Ursulin, intel-gfx
Quoting Tvrtko Ursulin (2020-10-14 09:36:08)
>
> On 13/10/2020 16:35, Chris Wilson wrote:
> > Repeat our sanitychecks from before execution to after execution. One
> > expects that if we were to see these, the gpu would already be on fire,
> > but the timing may be informative.
> >
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > ---
> > drivers/gpu/drm/i915/gt/intel_lrc.c | 10 +++++++---
> > 1 file changed, 7 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c
> > index 287537089c77..3dbdd5d0cb60 100644
> > --- a/drivers/gpu/drm/i915/gt/intel_lrc.c
> > +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
> > @@ -1216,7 +1216,8 @@ static void intel_engine_context_out(struct intel_engine_cs *engine)
> >
> > static void
> > execlists_check_context(const struct intel_context *ce,
> > - const struct intel_engine_cs *engine)
> > + const struct intel_engine_cs *engine,
> > + const char *when)
> > {
> > const struct intel_ring *ring = ce->ring;
> > u32 *regs = ce->lrc_reg_state;
> > @@ -1251,7 +1252,7 @@ execlists_check_context(const struct intel_context *ce,
> > valid = false;
> > }
> >
> > - WARN_ONCE(!valid, "Invalid lrc state found before submission\n");
> > + WARN_ONCE(!valid, "Invalid lrc state found %s submission\n", when);
> > }
> >
> > static void restore_default_state(struct intel_context *ce,
> > @@ -1347,7 +1348,7 @@ __execlists_schedule_in(struct i915_request *rq)
> > reset_active(rq, engine);
> >
> > if (IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM))
> > - execlists_check_context(ce, engine);
> > + execlists_check_context(ce, engine, "before");
> >
> > if (ce->tag) {
> > /* Use a fixed tag for OA and friends */
> > @@ -1418,6 +1419,9 @@ __execlists_schedule_out(struct i915_request *rq,
> > * refrain from doing non-trivial work here.
> > */
> >
> > + if (IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM))
> > + execlists_check_context(ce, engine, "after");
> > +
>
> CI failures here are either something super scary or a simple mistake
> which I cannot see. Or is engine retire, possible queued up before,
> racing with current schedule_out?
It's the unpark while the process_csb is not yet flushed, so we scrub
the kernel_context before it is scheduled-out. It could in theory be a
real problem with our scrubbing to simulate an issue causing an issue,
but the timing is quite slim.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Intel-gfx] [PATCH] drm/i915/gt: Confirm the context survives execution
2020-10-13 15:35 [Intel-gfx] [PATCH] drm/i915/gt: Confirm the context survives execution Chris Wilson
2020-10-13 16:20 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for " Patchwork
2020-10-14 8:36 ` [Intel-gfx] [PATCH] " Tvrtko Ursulin
@ 2020-10-14 8:43 ` Chris Wilson
2020-10-15 15:15 ` Tvrtko Ursulin
2020-10-15 15:32 ` Tvrtko Ursulin
2020-10-14 9:56 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/gt: Confirm the context survives execution (rev2) Patchwork
2020-10-14 17:39 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
4 siblings, 2 replies; 11+ messages in thread
From: Chris Wilson @ 2020-10-14 8:43 UTC (permalink / raw)
To: intel-gfx; +Cc: Chris Wilson
Repeat our sanitychecks from before execution to after execution. One
expects that if we were to see these, the gpu would already be on fire,
but the timing may be informative.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/gt/intel_engine_pm.c | 37 +++++++++++++++--------
drivers/gpu/drm/i915/gt/intel_lrc.c | 12 ++++++--
2 files changed, 34 insertions(+), 15 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_engine_pm.c b/drivers/gpu/drm/i915/gt/intel_engine_pm.c
index f7b2e07e2229..c5376790a6b9 100644
--- a/drivers/gpu/drm/i915/gt/intel_engine_pm.c
+++ b/drivers/gpu/drm/i915/gt/intel_engine_pm.c
@@ -17,6 +17,25 @@
#include "intel_ring.h"
#include "shmem_utils.h"
+static void dbg_poison_ce(struct intel_context *ce)
+{
+ if (!IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM))
+ return;
+
+ if (ce->state) {
+ struct drm_i915_gem_object *obj = ce->state->obj;
+ int type = i915_coherent_map_type(ce->engine->i915);
+ void *map;
+
+ map = i915_gem_object_pin_map(obj, type);
+ if (!IS_ERR(map)) {
+ memset(map, CONTEXT_REDZONE, obj->base.size);
+ i915_gem_object_flush_map(obj);
+ i915_gem_object_unpin_map(obj);
+ }
+ }
+}
+
static int __engine_unpark(struct intel_wakeref *wf)
{
struct intel_engine_cs *engine =
@@ -32,20 +51,14 @@ static int __engine_unpark(struct intel_wakeref *wf)
if (ce) {
GEM_BUG_ON(test_bit(CONTEXT_VALID_BIT, &ce->flags));
+ /* Flush all pending HW writes before we touch the context */
+ while (unlikely(intel_context_inflight(ce)))
+ intel_engine_flush_submission(ce->engine);
+
/* First poison the image to verify we never fully trust it */
- if (IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM) && ce->state) {
- struct drm_i915_gem_object *obj = ce->state->obj;
- int type = i915_coherent_map_type(engine->i915);
- void *map;
-
- map = i915_gem_object_pin_map(obj, type);
- if (!IS_ERR(map)) {
- memset(map, CONTEXT_REDZONE, obj->base.size);
- i915_gem_object_flush_map(obj);
- i915_gem_object_unpin_map(obj);
- }
- }
+ dbg_poison_ce(ce);
+ /* Scrub the context image after our loss of control */
ce->ops->reset(ce);
}
diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c
index 287537089c77..6170f6874f52 100644
--- a/drivers/gpu/drm/i915/gt/intel_lrc.c
+++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
@@ -1216,7 +1216,8 @@ static void intel_engine_context_out(struct intel_engine_cs *engine)
static void
execlists_check_context(const struct intel_context *ce,
- const struct intel_engine_cs *engine)
+ const struct intel_engine_cs *engine,
+ const char *when)
{
const struct intel_ring *ring = ce->ring;
u32 *regs = ce->lrc_reg_state;
@@ -1251,7 +1252,7 @@ execlists_check_context(const struct intel_context *ce,
valid = false;
}
- WARN_ONCE(!valid, "Invalid lrc state found before submission\n");
+ WARN_ONCE(!valid, "Invalid lrc state found %s submission\n", when);
}
static void restore_default_state(struct intel_context *ce,
@@ -1347,7 +1348,7 @@ __execlists_schedule_in(struct i915_request *rq)
reset_active(rq, engine);
if (IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM))
- execlists_check_context(ce, engine);
+ execlists_check_context(ce, engine, "before");
if (ce->tag) {
/* Use a fixed tag for OA and friends */
@@ -1418,6 +1419,9 @@ __execlists_schedule_out(struct i915_request *rq,
* refrain from doing non-trivial work here.
*/
+ if (IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM))
+ execlists_check_context(ce, engine, "after");
+
/*
* If we have just completed this context, the engine may now be
* idle and we want to re-enter powersaving.
@@ -4078,6 +4082,8 @@ static void reset_csb_pointers(struct intel_engine_cs *engine)
static void execlists_sanitize(struct intel_engine_cs *engine)
{
+ GEM_BUG_ON(execlists_active(&engine->execlists));
+
/*
* Poison residual state on resume, in case the suspend didn't!
*
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/gt: Confirm the context survives execution
2020-10-14 8:43 ` Chris Wilson
@ 2020-10-14 9:06 ` Tvrtko Ursulin
2020-10-14 9:09 ` Chris Wilson
0 siblings, 1 reply; 11+ messages in thread
From: Tvrtko Ursulin @ 2020-10-14 9:06 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
On 14/10/2020 09:43, Chris Wilson wrote:
> Quoting Tvrtko Ursulin (2020-10-14 09:36:08)
>>
>> On 13/10/2020 16:35, Chris Wilson wrote:
>>> Repeat our sanitychecks from before execution to after execution. One
>>> expects that if we were to see these, the gpu would already be on fire,
>>> but the timing may be informative.
>>>
>>> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>>> ---
>>> drivers/gpu/drm/i915/gt/intel_lrc.c | 10 +++++++---
>>> 1 file changed, 7 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c
>>> index 287537089c77..3dbdd5d0cb60 100644
>>> --- a/drivers/gpu/drm/i915/gt/intel_lrc.c
>>> +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
>>> @@ -1216,7 +1216,8 @@ static void intel_engine_context_out(struct intel_engine_cs *engine)
>>>
>>> static void
>>> execlists_check_context(const struct intel_context *ce,
>>> - const struct intel_engine_cs *engine)
>>> + const struct intel_engine_cs *engine,
>>> + const char *when)
>>> {
>>> const struct intel_ring *ring = ce->ring;
>>> u32 *regs = ce->lrc_reg_state;
>>> @@ -1251,7 +1252,7 @@ execlists_check_context(const struct intel_context *ce,
>>> valid = false;
>>> }
>>>
>>> - WARN_ONCE(!valid, "Invalid lrc state found before submission\n");
>>> + WARN_ONCE(!valid, "Invalid lrc state found %s submission\n", when);
>>> }
>>>
>>> static void restore_default_state(struct intel_context *ce,
>>> @@ -1347,7 +1348,7 @@ __execlists_schedule_in(struct i915_request *rq)
>>> reset_active(rq, engine);
>>>
>>> if (IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM))
>>> - execlists_check_context(ce, engine);
>>> + execlists_check_context(ce, engine, "before");
>>>
>>> if (ce->tag) {
>>> /* Use a fixed tag for OA and friends */
>>> @@ -1418,6 +1419,9 @@ __execlists_schedule_out(struct i915_request *rq,
>>> * refrain from doing non-trivial work here.
>>> */
>>>
>>> + if (IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM))
>>> + execlists_check_context(ce, engine, "after");
>>> +
>>
>> CI failures here are either something super scary or a simple mistake
>> which I cannot see. Or is engine retire, possible queued up before,
>> racing with current schedule_out?
>
> It's the unpark while the process_csb is not yet flushed, so we scrub
> the kernel_context before it is scheduled-out. It could in theory be a
> real problem with our scrubbing to simulate an issue causing an issue,
> but the timing is quite slim.
Unpark with unflushed process_csb? I thought maybe you meant park, but
poisoning is indeed in unpark. Put pending process_csb means engine is
supposed to be unparked already. Or you are saying it went through the
parked-unparked cycle all with pending process_csb?
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/gt: Confirm the context survives execution
2020-10-14 9:06 ` Tvrtko Ursulin
@ 2020-10-14 9:09 ` Chris Wilson
0 siblings, 0 replies; 11+ messages in thread
From: Chris Wilson @ 2020-10-14 9:09 UTC (permalink / raw)
To: Tvrtko Ursulin, intel-gfx
Quoting Tvrtko Ursulin (2020-10-14 10:06:11)
>
> On 14/10/2020 09:43, Chris Wilson wrote:
> > Quoting Tvrtko Ursulin (2020-10-14 09:36:08)
> >>
> >> On 13/10/2020 16:35, Chris Wilson wrote:
> >>> Repeat our sanitychecks from before execution to after execution. One
> >>> expects that if we were to see these, the gpu would already be on fire,
> >>> but the timing may be informative.
> >>>
> >>> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> >>> ---
> >>> drivers/gpu/drm/i915/gt/intel_lrc.c | 10 +++++++---
> >>> 1 file changed, 7 insertions(+), 3 deletions(-)
> >>>
> >>> diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c
> >>> index 287537089c77..3dbdd5d0cb60 100644
> >>> --- a/drivers/gpu/drm/i915/gt/intel_lrc.c
> >>> +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
> >>> @@ -1216,7 +1216,8 @@ static void intel_engine_context_out(struct intel_engine_cs *engine)
> >>>
> >>> static void
> >>> execlists_check_context(const struct intel_context *ce,
> >>> - const struct intel_engine_cs *engine)
> >>> + const struct intel_engine_cs *engine,
> >>> + const char *when)
> >>> {
> >>> const struct intel_ring *ring = ce->ring;
> >>> u32 *regs = ce->lrc_reg_state;
> >>> @@ -1251,7 +1252,7 @@ execlists_check_context(const struct intel_context *ce,
> >>> valid = false;
> >>> }
> >>>
> >>> - WARN_ONCE(!valid, "Invalid lrc state found before submission\n");
> >>> + WARN_ONCE(!valid, "Invalid lrc state found %s submission\n", when);
> >>> }
> >>>
> >>> static void restore_default_state(struct intel_context *ce,
> >>> @@ -1347,7 +1348,7 @@ __execlists_schedule_in(struct i915_request *rq)
> >>> reset_active(rq, engine);
> >>>
> >>> if (IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM))
> >>> - execlists_check_context(ce, engine);
> >>> + execlists_check_context(ce, engine, "before");
> >>>
> >>> if (ce->tag) {
> >>> /* Use a fixed tag for OA and friends */
> >>> @@ -1418,6 +1419,9 @@ __execlists_schedule_out(struct i915_request *rq,
> >>> * refrain from doing non-trivial work here.
> >>> */
> >>>
> >>> + if (IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM))
> >>> + execlists_check_context(ce, engine, "after");
> >>> +
> >>
> >> CI failures here are either something super scary or a simple mistake
> >> which I cannot see. Or is engine retire, possible queued up before,
> >> racing with current schedule_out?
> >
> > It's the unpark while the process_csb is not yet flushed, so we scrub
> > the kernel_context before it is scheduled-out. It could in theory be a
> > real problem with our scrubbing to simulate an issue causing an issue,
> > but the timing is quite slim.
>
> Unpark with unflushed process_csb? I thought maybe you meant park, but
> poisoning is indeed in unpark. Put pending process_csb means engine is
> supposed to be unparked already. Or you are saying it went through the
> parked-unparked cycle all with pending process_csb?
Yes. A pending CSB has a GT wakeref (for the interrupt) not an engine
wakeref, which boils down to that we use the engine parking to force the
context switch with one last submission.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/gt: Confirm the context survives execution (rev2)
2020-10-13 15:35 [Intel-gfx] [PATCH] drm/i915/gt: Confirm the context survives execution Chris Wilson
` (2 preceding siblings ...)
2020-10-14 8:43 ` Chris Wilson
@ 2020-10-14 9:56 ` Patchwork
2020-10-14 17:39 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
4 siblings, 0 replies; 11+ messages in thread
From: Patchwork @ 2020-10-14 9:56 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 5122 bytes --]
== Series Details ==
Series: drm/i915/gt: Confirm the context survives execution (rev2)
URL : https://patchwork.freedesktop.org/series/82633/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_9138 -> Patchwork_18697
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_18697:
### IGT changes ###
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses.
They do not affect the overall result.
* igt@gem_exec_suspend@basic-s3:
- {fi-kbl-7560u}: NOTRUN -> [INCOMPLETE][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/fi-kbl-7560u/igt@gem_exec_suspend@basic-s3.html
Known issues
------------
Here are the changes found in Patchwork_18697 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- fi-bsw-n3050: [PASS][2] -> [DMESG-WARN][3] ([i915#1982])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/fi-bsw-n3050/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/fi-bsw-n3050/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html
* igt@vgem_basic@dmabuf-fence:
- fi-tgl-y: [PASS][4] -> [DMESG-WARN][5] ([i915#402]) +1 similar issue
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/fi-tgl-y/igt@vgem_basic@dmabuf-fence.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/fi-tgl-y/igt@vgem_basic@dmabuf-fence.html
#### Possible fixes ####
* igt@debugfs_test@read_all_entries:
- {fi-kbl-7560u}: [INCOMPLETE][6] ([i915#2417]) -> [PASS][7]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/fi-kbl-7560u/igt@debugfs_test@read_all_entries.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/fi-kbl-7560u/igt@debugfs_test@read_all_entries.html
* igt@i915_module_load@reload:
- fi-tgl-y: [DMESG-WARN][8] ([i915#1982] / [k.org#205379]) -> [PASS][9]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/fi-tgl-y/igt@i915_module_load@reload.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/fi-tgl-y/igt@i915_module_load@reload.html
- fi-icl-y: [DMESG-WARN][10] ([i915#1982]) -> [PASS][11]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/fi-icl-y/igt@i915_module_load@reload.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/fi-icl-y/igt@i915_module_load@reload.html
* igt@prime_self_import@basic-with_two_bos:
- fi-tgl-y: [DMESG-WARN][12] ([i915#402]) -> [PASS][13] +1 similar issue
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/fi-tgl-y/igt@prime_self_import@basic-with_two_bos.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/fi-tgl-y/igt@prime_self_import@basic-with_two_bos.html
#### Warnings ####
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- fi-tgl-y: [DMESG-WARN][14] ([i915#1982] / [i915#2411]) -> [DMESG-WARN][15] ([i915#2411])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/fi-tgl-y/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a.html
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/fi-tgl-y/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[i915#1784]: https://gitlab.freedesktop.org/drm/intel/issues/1784
[i915#1814]: https://gitlab.freedesktop.org/drm/intel/issues/1814
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2411]: https://gitlab.freedesktop.org/drm/intel/issues/2411
[i915#2417]: https://gitlab.freedesktop.org/drm/intel/issues/2417
[i915#2439]: https://gitlab.freedesktop.org/drm/intel/issues/2439
[i915#289]: https://gitlab.freedesktop.org/drm/intel/issues/289
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
[k.org#205379]: https://bugzilla.kernel.org/show_bug.cgi?id=205379
Participating hosts (46 -> 40)
------------------------------
Missing (6): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-byt-clapper fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_9138 -> Patchwork_18697
CI-20190529: 20190529
CI_DRM_9138: 5e4234f97efbaa30f0beb243dcf98fe0a0bb0945 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5814: 7671d004f4b86d45ae54ee6443b14a18552548bd @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18697: 60cd2a1c84a25deeaa7b539d1e679257fdfc7054 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
60cd2a1c84a2 drm/i915/gt: Confirm the context survives execution
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/index.html
[-- Attachment #1.2: Type: text/html, Size: 5980 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Intel-gfx] ✗ Fi.CI.IGT: failure for drm/i915/gt: Confirm the context survives execution (rev2)
2020-10-13 15:35 [Intel-gfx] [PATCH] drm/i915/gt: Confirm the context survives execution Chris Wilson
` (3 preceding siblings ...)
2020-10-14 9:56 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/gt: Confirm the context survives execution (rev2) Patchwork
@ 2020-10-14 17:39 ` Patchwork
4 siblings, 0 replies; 11+ messages in thread
From: Patchwork @ 2020-10-14 17:39 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 19606 bytes --]
== Series Details ==
Series: drm/i915/gt: Confirm the context survives execution (rev2)
URL : https://patchwork.freedesktop.org/series/82633/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_9138_full -> Patchwork_18697_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_18697_full absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_18697_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_18697_full:
### IGT changes ###
#### Possible regressions ####
* igt@gem_linear_blits@normal:
- shard-snb: NOTRUN -> [FAIL][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-snb5/igt@gem_linear_blits@normal.html
* igt@kms_frontbuffer_tracking@fbc-rgb565-draw-blt:
- shard-tglb: NOTRUN -> [FAIL][2]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-tglb1/igt@kms_frontbuffer_tracking@fbc-rgb565-draw-blt.html
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-indfb-plflip-blt:
- shard-tglb: [PASS][3] -> [FAIL][4] +2 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-tglb8/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-indfb-plflip-blt.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-tglb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-indfb-plflip-blt.html
Known issues
------------
Here are the changes found in Patchwork_18697_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_shared@q-smoketest-all:
- shard-glk: [PASS][5] -> [FAIL][6] ([i915#1888])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-glk2/igt@gem_ctx_shared@q-smoketest-all.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-glk2/igt@gem_ctx_shared@q-smoketest-all.html
* igt@gem_exec_reloc@basic-many-active@vecs0:
- shard-glk: [PASS][7] -> [FAIL][8] ([i915#2389]) +2 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-glk7/igt@gem_exec_reloc@basic-many-active@vecs0.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-glk1/igt@gem_exec_reloc@basic-many-active@vecs0.html
* igt@kms_cursor_crc@pipe-b-cursor-128x128-offscreen:
- shard-skl: [PASS][9] -> [FAIL][10] ([i915#54])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-skl7/igt@kms_cursor_crc@pipe-b-cursor-128x128-offscreen.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-skl2/igt@kms_cursor_crc@pipe-b-cursor-128x128-offscreen.html
* igt@kms_cursor_edge_walk@pipe-b-256x256-left-edge:
- shard-glk: [PASS][11] -> [DMESG-WARN][12] ([i915#1982])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-glk6/igt@kms_cursor_edge_walk@pipe-b-256x256-left-edge.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-glk9/igt@kms_cursor_edge_walk@pipe-b-256x256-left-edge.html
* igt@kms_cursor_legacy@2x-long-flip-vs-cursor-legacy:
- shard-glk: [PASS][13] -> [FAIL][14] ([i915#72])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-glk1/igt@kms_cursor_legacy@2x-long-flip-vs-cursor-legacy.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-glk3/igt@kms_cursor_legacy@2x-long-flip-vs-cursor-legacy.html
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions:
- shard-skl: [PASS][15] -> [FAIL][16] ([i915#2346])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-skl9/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-skl10/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html
* igt@kms_flip_tiling@flip-y-tiled:
- shard-skl: [PASS][17] -> [FAIL][18] ([i915#699])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-skl3/igt@kms_flip_tiling@flip-y-tiled.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-skl9/igt@kms_flip_tiling@flip-y-tiled.html
* igt@kms_frontbuffer_tracking@fbcpsr-rgb565-draw-pwrite:
- shard-tglb: [PASS][19] -> [DMESG-WARN][20] ([i915#1982]) +2 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-tglb6/igt@kms_frontbuffer_tracking@fbcpsr-rgb565-draw-pwrite.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-tglb2/igt@kms_frontbuffer_tracking@fbcpsr-rgb565-draw-pwrite.html
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
- shard-snb: [PASS][21] -> [SKIP][22] ([fdo#109271]) +6 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-snb7/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-snb5/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b.html
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes:
- shard-skl: [PASS][23] -> [INCOMPLETE][24] ([i915#648])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-skl3/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-skl8/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes.html
* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: [PASS][25] -> [FAIL][26] ([fdo#108145] / [i915#265]) +1 similar issue
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-skl9/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-skl8/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
* igt@kms_psr@psr2_cursor_render:
- shard-iclb: [PASS][27] -> [SKIP][28] ([fdo#109441]) +1 similar issue
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-iclb2/igt@kms_psr@psr2_cursor_render.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-iclb7/igt@kms_psr@psr2_cursor_render.html
* igt@kms_universal_plane@disable-primary-vs-flip-pipe-b:
- shard-skl: [PASS][29] -> [DMESG-WARN][30] ([i915#1982]) +8 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-skl4/igt@kms_universal_plane@disable-primary-vs-flip-pipe-b.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-skl2/igt@kms_universal_plane@disable-primary-vs-flip-pipe-b.html
* igt@kms_universal_plane@universal-plane-gen9-features-pipe-a:
- shard-kbl: [PASS][31] -> [DMESG-WARN][32] ([i915#1982]) +1 similar issue
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-kbl6/igt@kms_universal_plane@universal-plane-gen9-features-pipe-a.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-kbl6/igt@kms_universal_plane@universal-plane-gen9-features-pipe-a.html
* igt@perf@polling-small-buf:
- shard-skl: [PASS][33] -> [FAIL][34] ([i915#1722])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-skl6/igt@perf@polling-small-buf.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-skl7/igt@perf@polling-small-buf.html
* igt@perf_pmu@busy-hang@vcs0:
- shard-glk: [PASS][35] -> [DMESG-WARN][36] ([i915#118] / [i915#95])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-glk2/igt@perf_pmu@busy-hang@vcs0.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-glk3/igt@perf_pmu@busy-hang@vcs0.html
#### Possible fixes ####
* {igt@core_hotunplug@unbind-rebind}:
- shard-iclb: [DMESG-WARN][37] ([i915#1982]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-iclb3/igt@core_hotunplug@unbind-rebind.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-iclb1/igt@core_hotunplug@unbind-rebind.html
* igt@gem_ctx_param@vm:
- shard-skl: [DMESG-WARN][39] ([i915#1982]) -> [PASS][40] +3 similar issues
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-skl4/igt@gem_ctx_param@vm.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-skl2/igt@gem_ctx_param@vm.html
* igt@gem_eio@unwedge-stress:
- shard-snb: [INCOMPLETE][41] ([i915#82]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-snb2/igt@gem_eio@unwedge-stress.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-snb5/igt@gem_eio@unwedge-stress.html
* {igt@gem_exec_capture@pi@vcs0}:
- shard-glk: [INCOMPLETE][43] ([i915#2553]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-glk8/igt@gem_exec_capture@pi@vcs0.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-glk1/igt@gem_exec_capture@pi@vcs0.html
* igt@gem_mmap_offset@blt-coherency:
- shard-apl: [FAIL][45] ([i915#1635]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-apl8/igt@gem_mmap_offset@blt-coherency.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-apl2/igt@gem_mmap_offset@blt-coherency.html
* igt@gem_userptr_blits@sync-unmap-cycles:
- shard-skl: [TIMEOUT][47] ([i915#2424]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-skl7/igt@gem_userptr_blits@sync-unmap-cycles.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-skl2/igt@gem_userptr_blits@sync-unmap-cycles.html
* igt@i915_pm_rc6_residency@rc6-idle:
- shard-snb: [FAIL][49] -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-snb2/igt@i915_pm_rc6_residency@rc6-idle.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-snb5/igt@i915_pm_rc6_residency@rc6-idle.html
* {igt@kms_async_flips@alternate-sync-async-flip}:
- shard-kbl: [FAIL][51] ([i915#2521]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-kbl4/igt@kms_async_flips@alternate-sync-async-flip.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-kbl7/igt@kms_async_flips@alternate-sync-async-flip.html
* igt@kms_big_fb@x-tiled-32bpp-rotate-0:
- shard-snb: [SKIP][53] ([fdo#109271]) -> [PASS][54] +5 similar issues
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-snb6/igt@kms_big_fb@x-tiled-32bpp-rotate-0.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-snb2/igt@kms_big_fb@x-tiled-32bpp-rotate-0.html
* igt@kms_cursor_crc@pipe-a-cursor-suspend:
- shard-kbl: [DMESG-WARN][55] ([i915#165]) -> [PASS][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-kbl2/igt@kms_cursor_crc@pipe-a-cursor-suspend.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-kbl1/igt@kms_cursor_crc@pipe-a-cursor-suspend.html
* igt@kms_cursor_legacy@pipe-c-torture-bo:
- shard-tglb: [DMESG-WARN][57] ([i915#128]) -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-tglb6/igt@kms_cursor_legacy@pipe-c-torture-bo.html
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-tglb2/igt@kms_cursor_legacy@pipe-c-torture-bo.html
* igt@kms_draw_crc@draw-method-xrgb2101010-mmap-wc-ytiled:
- shard-kbl: [DMESG-WARN][59] ([i915#1982]) -> [PASS][60]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-kbl2/igt@kms_draw_crc@draw-method-xrgb2101010-mmap-wc-ytiled.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-kbl1/igt@kms_draw_crc@draw-method-xrgb2101010-mmap-wc-ytiled.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1:
- shard-skl: [FAIL][61] ([i915#2122]) -> [PASS][62]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-skl8/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-skl3/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible@b-hdmi-a2:
- shard-glk: [FAIL][63] ([i915#79]) -> [PASS][64] +1 similar issue
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-glk3/igt@kms_flip@flip-vs-expired-vblank-interruptible@b-hdmi-a2.html
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-glk4/igt@kms_flip@flip-vs-expired-vblank-interruptible@b-hdmi-a2.html
* igt@kms_flip@flip-vs-suspend-interruptible@c-edp1:
- shard-skl: [INCOMPLETE][65] ([i915#198]) -> [PASS][66]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-skl2/igt@kms_flip@flip-vs-suspend-interruptible@c-edp1.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-skl1/igt@kms_flip@flip-vs-suspend-interruptible@c-edp1.html
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-indfb-msflip-blt:
- shard-tglb: [FAIL][67] -> [PASS][68] +1 similar issue
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-tglb8/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-indfb-msflip-blt.html
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-tglb3/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-indfb-msflip-blt.html
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-indfb-draw-pwrite:
- shard-glk: [INCOMPLETE][69] ([i915#95]) -> [PASS][70]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-glk6/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-indfb-draw-pwrite.html
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-glk9/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-indfb-draw-pwrite.html
* igt@kms_hdr@bpc-switch-suspend:
- shard-skl: [FAIL][71] ([i915#1188]) -> [PASS][72]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-skl3/igt@kms_hdr@bpc-switch-suspend.html
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-skl9/igt@kms_hdr@bpc-switch-suspend.html
* igt@kms_plane_lowres@pipe-b-tiling-none:
- shard-iclb: [FAIL][73] ([i915#899]) -> [PASS][74]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-iclb4/igt@kms_plane_lowres@pipe-b-tiling-none.html
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-iclb3/igt@kms_plane_lowres@pipe-b-tiling-none.html
* igt@kms_psr2_su@frontbuffer:
- shard-iclb: [SKIP][75] ([fdo#109642] / [fdo#111068]) -> [PASS][76]
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-iclb5/igt@kms_psr2_su@frontbuffer.html
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-iclb2/igt@kms_psr2_su@frontbuffer.html
* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [SKIP][77] ([fdo#109441]) -> [PASS][78] +2 similar issues
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-iclb3/igt@kms_psr@psr2_sprite_plane_move.html
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html
* igt@kms_setmode@basic:
- shard-apl: [FAIL][79] ([i915#1635] / [i915#31]) -> [PASS][80]
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-apl6/igt@kms_setmode@basic.html
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-apl6/igt@kms_setmode@basic.html
#### Warnings ####
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-indfb-plflip-blt:
- shard-tglb: [FAIL][81] -> [DMESG-FAIL][82] ([i915#1982])
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-tglb7/igt@kms_frontbuffer_tracking@psr-1p-primscrn-indfb-plflip-blt.html
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-tglb5/igt@kms_frontbuffer_tracking@psr-1p-primscrn-indfb-plflip-blt.html
* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min:
- shard-skl: [FAIL][83] ([fdo#108145] / [i915#265]) -> [DMESG-WARN][84] ([i915#1982])
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9138/shard-skl8/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/shard-skl3/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#128]: https://gitlab.freedesktop.org/drm/intel/issues/128
[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#165]: https://gitlab.freedesktop.org/drm/intel/issues/165
[i915#1722]: https://gitlab.freedesktop.org/drm/intel/issues/1722
[i915#1888]: https://gitlab.freedesktop.org/drm/intel/issues/1888
[i915#198]: https://gitlab.freedesktop.org/drm/intel/issues/198
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2389]: https://gitlab.freedesktop.org/drm/intel/issues/2389
[i915#2424]: https://gitlab.freedesktop.org/drm/intel/issues/2424
[i915#2521]: https://gitlab.freedesktop.org/drm/intel/issues/2521
[i915#2553]: https://gitlab.freedesktop.org/drm/intel/issues/2553
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#31]: https://gitlab.freedesktop.org/drm/intel/issues/31
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#648]: https://gitlab.freedesktop.org/drm/intel/issues/648
[i915#699]: https://gitlab.freedesktop.org/drm/intel/issues/699
[i915#72]: https://gitlab.freedesktop.org/drm/intel/issues/72
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#82]: https://gitlab.freedesktop.org/drm/intel/issues/82
[i915#899]: https://gitlab.freedesktop.org/drm/intel/issues/899
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (11 -> 11)
------------------------------
No changes in participating hosts
Build changes
-------------
* Linux: CI_DRM_9138 -> Patchwork_18697
CI-20190529: 20190529
CI_DRM_9138: 5e4234f97efbaa30f0beb243dcf98fe0a0bb0945 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5814: 7671d004f4b86d45ae54ee6443b14a18552548bd @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18697: 60cd2a1c84a25deeaa7b539d1e679257fdfc7054 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18697/index.html
[-- Attachment #1.2: Type: text/html, Size: 22258 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/gt: Confirm the context survives execution
2020-10-14 8:43 ` Chris Wilson
@ 2020-10-15 15:15 ` Tvrtko Ursulin
2020-10-15 15:32 ` Tvrtko Ursulin
1 sibling, 0 replies; 11+ messages in thread
From: Tvrtko Ursulin @ 2020-10-15 15:15 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
On 14/10/2020 09:43, Chris Wilson wrote:
> Repeat our sanitychecks from before execution to after execution. One
> expects that if we were to see these, the gpu would already be on fire,
> but the timing may be informative.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> ---
> drivers/gpu/drm/i915/gt/intel_engine_pm.c | 37 +++++++++++++++--------
> drivers/gpu/drm/i915/gt/intel_lrc.c | 12 ++++++--
> 2 files changed, 34 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_engine_pm.c b/drivers/gpu/drm/i915/gt/intel_engine_pm.c
> index f7b2e07e2229..c5376790a6b9 100644
> --- a/drivers/gpu/drm/i915/gt/intel_engine_pm.c
> +++ b/drivers/gpu/drm/i915/gt/intel_engine_pm.c
> @@ -17,6 +17,25 @@
> #include "intel_ring.h"
> #include "shmem_utils.h"
>
> +static void dbg_poison_ce(struct intel_context *ce)
> +{
> + if (!IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM))
> + return;
> +
> + if (ce->state) {
> + struct drm_i915_gem_object *obj = ce->state->obj;
> + int type = i915_coherent_map_type(ce->engine->i915);
> + void *map;
> +
> + map = i915_gem_object_pin_map(obj, type);
> + if (!IS_ERR(map)) {
> + memset(map, CONTEXT_REDZONE, obj->base.size);
> + i915_gem_object_flush_map(obj);
> + i915_gem_object_unpin_map(obj);
> + }
> + }
> +}
> +
> static int __engine_unpark(struct intel_wakeref *wf)
> {
> struct intel_engine_cs *engine =
> @@ -32,20 +51,14 @@ static int __engine_unpark(struct intel_wakeref *wf)
> if (ce) {
> GEM_BUG_ON(test_bit(CONTEXT_VALID_BIT, &ce->flags));
>
> + /* Flush all pending HW writes before we touch the context */
> + while (unlikely(intel_context_inflight(ce)))
> + intel_engine_flush_submission(ce->engine);
> +
> /* First poison the image to verify we never fully trust it */
> - if (IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM) && ce->state) {
> - struct drm_i915_gem_object *obj = ce->state->obj;
> - int type = i915_coherent_map_type(engine->i915);
> - void *map;
> -
> - map = i915_gem_object_pin_map(obj, type);
> - if (!IS_ERR(map)) {
> - memset(map, CONTEXT_REDZONE, obj->base.size);
> - i915_gem_object_flush_map(obj);
> - i915_gem_object_unpin_map(obj);
> - }
> - }
> + dbg_poison_ce(ce);
>
> + /* Scrub the context image after our loss of control */
> ce->ops->reset(ce);
> }
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c
> index 287537089c77..6170f6874f52 100644
> --- a/drivers/gpu/drm/i915/gt/intel_lrc.c
> +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
> @@ -1216,7 +1216,8 @@ static void intel_engine_context_out(struct intel_engine_cs *engine)
>
> static void
> execlists_check_context(const struct intel_context *ce,
> - const struct intel_engine_cs *engine)
> + const struct intel_engine_cs *engine,
> + const char *when)
> {
> const struct intel_ring *ring = ce->ring;
> u32 *regs = ce->lrc_reg_state;
> @@ -1251,7 +1252,7 @@ execlists_check_context(const struct intel_context *ce,
> valid = false;
> }
>
> - WARN_ONCE(!valid, "Invalid lrc state found before submission\n");
> + WARN_ONCE(!valid, "Invalid lrc state found %s submission\n", when);
> }
>
> static void restore_default_state(struct intel_context *ce,
> @@ -1347,7 +1348,7 @@ __execlists_schedule_in(struct i915_request *rq)
> reset_active(rq, engine);
>
> if (IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM))
> - execlists_check_context(ce, engine);
> + execlists_check_context(ce, engine, "before");
>
> if (ce->tag) {
> /* Use a fixed tag for OA and friends */
> @@ -1418,6 +1419,9 @@ __execlists_schedule_out(struct i915_request *rq,
> * refrain from doing non-trivial work here.
> */
>
> + if (IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM))
> + execlists_check_context(ce, engine, "after");
> +
> /*
> * If we have just completed this context, the engine may now be
> * idle and we want to re-enter powersaving.
> @@ -4078,6 +4082,8 @@ static void reset_csb_pointers(struct intel_engine_cs *engine)
>
> static void execlists_sanitize(struct intel_engine_cs *engine)
> {
> + GEM_BUG_ON(execlists_active(&engine->execlists));
> +
> /*
> * Poison residual state on resume, in case the suspend didn't!
> *
>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/gt: Confirm the context survives execution
2020-10-14 8:43 ` Chris Wilson
2020-10-15 15:15 ` Tvrtko Ursulin
@ 2020-10-15 15:32 ` Tvrtko Ursulin
1 sibling, 0 replies; 11+ messages in thread
From: Tvrtko Ursulin @ 2020-10-15 15:32 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
On 14/10/2020 09:43, Chris Wilson wrote:
> Repeat our sanitychecks from before execution to after execution. One
> expects that if we were to see these, the gpu would already be on fire,
> but the timing may be informative.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> ---
> drivers/gpu/drm/i915/gt/intel_engine_pm.c | 37 +++++++++++++++--------
> drivers/gpu/drm/i915/gt/intel_lrc.c | 12 ++++++--
> 2 files changed, 34 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_engine_pm.c b/drivers/gpu/drm/i915/gt/intel_engine_pm.c
> index f7b2e07e2229..c5376790a6b9 100644
> --- a/drivers/gpu/drm/i915/gt/intel_engine_pm.c
> +++ b/drivers/gpu/drm/i915/gt/intel_engine_pm.c
> @@ -17,6 +17,25 @@
> #include "intel_ring.h"
> #include "shmem_utils.h"
>
> +static void dbg_poison_ce(struct intel_context *ce)
> +{
> + if (!IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM))
> + return;
> +
> + if (ce->state) {
> + struct drm_i915_gem_object *obj = ce->state->obj;
> + int type = i915_coherent_map_type(ce->engine->i915);
> + void *map;
> +
> + map = i915_gem_object_pin_map(obj, type);
> + if (!IS_ERR(map)) {
> + memset(map, CONTEXT_REDZONE, obj->base.size);
> + i915_gem_object_flush_map(obj);
> + i915_gem_object_unpin_map(obj);
> + }
> + }
> +}
> +
> static int __engine_unpark(struct intel_wakeref *wf)
> {
> struct intel_engine_cs *engine =
> @@ -32,20 +51,14 @@ static int __engine_unpark(struct intel_wakeref *wf)
> if (ce) {
> GEM_BUG_ON(test_bit(CONTEXT_VALID_BIT, &ce->flags));
>
> + /* Flush all pending HW writes before we touch the context */
> + while (unlikely(intel_context_inflight(ce)))
> + intel_engine_flush_submission(ce->engine);
s/ce->engine/engine/, insert small value of improvement here >.< :)
Regards,
Tvrtko
> +
> /* First poison the image to verify we never fully trust it */
> - if (IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM) && ce->state) {
> - struct drm_i915_gem_object *obj = ce->state->obj;
> - int type = i915_coherent_map_type(engine->i915);
> - void *map;
> -
> - map = i915_gem_object_pin_map(obj, type);
> - if (!IS_ERR(map)) {
> - memset(map, CONTEXT_REDZONE, obj->base.size);
> - i915_gem_object_flush_map(obj);
> - i915_gem_object_unpin_map(obj);
> - }
> - }
> + dbg_poison_ce(ce);
>
> + /* Scrub the context image after our loss of control */
> ce->ops->reset(ce);
> }
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c
> index 287537089c77..6170f6874f52 100644
> --- a/drivers/gpu/drm/i915/gt/intel_lrc.c
> +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
> @@ -1216,7 +1216,8 @@ static void intel_engine_context_out(struct intel_engine_cs *engine)
>
> static void
> execlists_check_context(const struct intel_context *ce,
> - const struct intel_engine_cs *engine)
> + const struct intel_engine_cs *engine,
> + const char *when)
> {
> const struct intel_ring *ring = ce->ring;
> u32 *regs = ce->lrc_reg_state;
> @@ -1251,7 +1252,7 @@ execlists_check_context(const struct intel_context *ce,
> valid = false;
> }
>
> - WARN_ONCE(!valid, "Invalid lrc state found before submission\n");
> + WARN_ONCE(!valid, "Invalid lrc state found %s submission\n", when);
> }
>
> static void restore_default_state(struct intel_context *ce,
> @@ -1347,7 +1348,7 @@ __execlists_schedule_in(struct i915_request *rq)
> reset_active(rq, engine);
>
> if (IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM))
> - execlists_check_context(ce, engine);
> + execlists_check_context(ce, engine, "before");
>
> if (ce->tag) {
> /* Use a fixed tag for OA and friends */
> @@ -1418,6 +1419,9 @@ __execlists_schedule_out(struct i915_request *rq,
> * refrain from doing non-trivial work here.
> */
>
> + if (IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM))
> + execlists_check_context(ce, engine, "after");
> +
> /*
> * If we have just completed this context, the engine may now be
> * idle and we want to re-enter powersaving.
> @@ -4078,6 +4082,8 @@ static void reset_csb_pointers(struct intel_engine_cs *engine)
>
> static void execlists_sanitize(struct intel_engine_cs *engine)
> {
> + GEM_BUG_ON(execlists_active(&engine->execlists));
> +
> /*
> * Poison residual state on resume, in case the suspend didn't!
> *
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2020-10-15 15:32 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-13 15:35 [Intel-gfx] [PATCH] drm/i915/gt: Confirm the context survives execution Chris Wilson
2020-10-13 16:20 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for " Patchwork
2020-10-14 8:36 ` [Intel-gfx] [PATCH] " Tvrtko Ursulin
2020-10-14 8:43 ` Chris Wilson
2020-10-14 9:06 ` Tvrtko Ursulin
2020-10-14 9:09 ` Chris Wilson
2020-10-14 8:43 ` Chris Wilson
2020-10-15 15:15 ` Tvrtko Ursulin
2020-10-15 15:32 ` Tvrtko Ursulin
2020-10-14 9:56 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/gt: Confirm the context survives execution (rev2) Patchwork
2020-10-14 17:39 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
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.