* [Intel-gfx] [CI] drm/i915/execlists: Record the active CCID from before reset @ 2020-05-05 8:46 Chris Wilson 2020-05-05 10:46 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork 2020-05-05 20:09 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork 0 siblings, 2 replies; 3+ messages in thread From: Chris Wilson @ 2020-05-05 8:46 UTC (permalink / raw) To: intel-gfx If we cannot trust the reset will flush out the CS event queue such that process_csb() reports an accurate view of HW, we will need to search the active and pending contexts to determine which was actually running at the time we issued the reset. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com> --- drivers/gpu/drm/i915/gt/intel_engine_types.h | 5 +++++ drivers/gpu/drm/i915/gt/intel_lrc.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gt/intel_engine_types.h b/drivers/gpu/drm/i915/gt/intel_engine_types.h index 6c676774dcd9..b1048f039552 100644 --- a/drivers/gpu/drm/i915/gt/intel_engine_types.h +++ b/drivers/gpu/drm/i915/gt/intel_engine_types.h @@ -179,6 +179,11 @@ struct intel_engine_execlists { */ u32 error_interrupt; + /** + * @reset_ccid: Active CCID [EXECLISTS_STATUS_HI] at the time of reset + */ + u32 reset_ccid; + /** * @no_priolist: priority lists disabled */ diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c index c00366387b54..3ff81c89fe01 100644 --- a/drivers/gpu/drm/i915/gt/intel_lrc.c +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c @@ -4074,6 +4074,8 @@ static void execlists_reset_prepare(struct intel_engine_cs *engine) */ ring_set_paused(engine, 1); intel_engine_stop_cs(engine); + + engine->execlists.reset_ccid = active_ccid(engine); } static void __reset_stop_ring(u32 *regs, const struct intel_engine_cs *engine) @@ -4116,7 +4118,7 @@ static void __execlists_reset(struct intel_engine_cs *engine, bool stalled) * its request, it was still running at the time of the * reset and will have been clobbered. */ - rq = execlists_active(execlists); + rq = active_context(engine, engine->execlists.reset_ccid); if (!rq) goto unwind; -- 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] 3+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/execlists: Record the active CCID from before reset 2020-05-05 8:46 [Intel-gfx] [CI] drm/i915/execlists: Record the active CCID from before reset Chris Wilson @ 2020-05-05 10:46 ` Patchwork 2020-05-05 20:09 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork 1 sibling, 0 replies; 3+ messages in thread From: Patchwork @ 2020-05-05 10:46 UTC (permalink / raw) To: Chris Wilson; +Cc: intel-gfx == Series Details == Series: drm/i915/execlists: Record the active CCID from before reset URL : https://patchwork.freedesktop.org/series/76946/ State : success == Summary == CI Bug Log - changes from CI_DRM_8427 -> Patchwork_17580 ==================================================== Summary ------- **SUCCESS** No regressions found. External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17580/index.html Known issues ------------ Here are the changes found in Patchwork_17580 that come from known issues: ### IGT changes ### #### Issues hit #### * igt@i915_selftest@live@gt_engines: - fi-bwr-2160: [PASS][1] -> [INCOMPLETE][2] ([i915#489]) [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8427/fi-bwr-2160/igt@i915_selftest@live@gt_engines.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17580/fi-bwr-2160/igt@i915_selftest@live@gt_engines.html [i915#489]: https://gitlab.freedesktop.org/drm/intel/issues/489 Participating hosts (50 -> 43) ------------------------------ Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper fi-bdw-samus Build changes ------------- * CI: CI-20190529 -> None * Linux: CI_DRM_8427 -> Patchwork_17580 CI-20190529: 20190529 CI_DRM_8427: d7afe86abe766f68e758be1c9db6618e55bdf38d @ git://anongit.freedesktop.org/gfx-ci/linux IGT_5632: e630cb8cd2ec01d6d5358eb2a3f6ea70498b8183 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools Patchwork_17580: 92e7b4e3f924ed7fd4d57f69f156573ac43684cb @ git://anongit.freedesktop.org/gfx-ci/linux == Linux commits == 92e7b4e3f924 drm/i915/execlists: Record the active CCID from before reset == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17580/index.html _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 3+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915/execlists: Record the active CCID from before reset 2020-05-05 8:46 [Intel-gfx] [CI] drm/i915/execlists: Record the active CCID from before reset Chris Wilson 2020-05-05 10:46 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork @ 2020-05-05 20:09 ` Patchwork 1 sibling, 0 replies; 3+ messages in thread From: Patchwork @ 2020-05-05 20:09 UTC (permalink / raw) To: Chris Wilson; +Cc: intel-gfx == Series Details == Series: drm/i915/execlists: Record the active CCID from before reset URL : https://patchwork.freedesktop.org/series/76946/ State : success == Summary == CI Bug Log - changes from CI_DRM_8427_full -> Patchwork_17580_full ==================================================== Summary ------- **SUCCESS** No regressions found. Known issues ------------ Here are the changes found in Patchwork_17580_full that come from known issues: ### IGT changes ### #### Issues hit #### * igt@gem_eio@in-flight-suspend: - shard-apl: [PASS][1] -> [DMESG-WARN][2] ([i915#180]) [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8427/shard-apl8/igt@gem_eio@in-flight-suspend.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17580/shard-apl4/igt@gem_eio@in-flight-suspend.html * igt@gem_workarounds@suspend-resume-context: - shard-kbl: [PASS][3] -> [DMESG-WARN][4] ([i915#180]) [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8427/shard-kbl7/igt@gem_workarounds@suspend-resume-context.html [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17580/shard-kbl1/igt@gem_workarounds@suspend-resume-context.html * igt@i915_pm_backlight@fade_with_suspend: - shard-skl: [PASS][5] -> [INCOMPLETE][6] ([i915#69]) [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8427/shard-skl1/igt@i915_pm_backlight@fade_with_suspend.html [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17580/shard-skl4/igt@i915_pm_backlight@fade_with_suspend.html * igt@kms_cursor_crc@pipe-c-cursor-suspend: - shard-skl: [PASS][7] -> [INCOMPLETE][8] ([i915#300]) [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8427/shard-skl3/igt@kms_cursor_crc@pipe-c-cursor-suspend.html [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17580/shard-skl10/igt@kms_cursor_crc@pipe-c-cursor-suspend.html * igt@kms_cursor_edge_walk@pipe-a-64x64-top-edge: - shard-apl: [PASS][9] -> [FAIL][10] ([i915#70]) [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8427/shard-apl1/igt@kms_cursor_edge_walk@pipe-a-64x64-top-edge.html [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17580/shard-apl1/igt@kms_cursor_edge_walk@pipe-a-64x64-top-edge.html - shard-kbl: [PASS][11] -> [FAIL][12] ([i915#70]) [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8427/shard-kbl4/igt@kms_cursor_edge_walk@pipe-a-64x64-top-edge.html [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17580/shard-kbl7/igt@kms_cursor_edge_walk@pipe-a-64x64-top-edge.html * igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic: - shard-hsw: [PASS][13] -> [FAIL][14] ([i915#96]) [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8427/shard-hsw7/igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic.html [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17580/shard-hsw8/igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic.html * igt@kms_frontbuffer_tracking@fbc-suspend: - shard-apl: [PASS][15] -> [DMESG-WARN][16] ([i915#180] / [i915#95]) +1 similar issue [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8427/shard-apl1/igt@kms_frontbuffer_tracking@fbc-suspend.html [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17580/shard-apl6/igt@kms_frontbuffer_tracking@fbc-suspend.html * igt@kms_frontbuffer_tracking@psr-rgb101010-draw-mmap-cpu: - shard-skl: [PASS][17] -> [FAIL][18] ([i915#49]) [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8427/shard-skl7/igt@kms_frontbuffer_tracking@psr-rgb101010-draw-mmap-cpu.html [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17580/shard-skl4/igt@kms_frontbuffer_tracking@psr-rgb101010-draw-mmap-cpu.html * igt@kms_hdr@bpc-switch: - shard-skl: [PASS][19] -> [FAIL][20] ([i915#1188]) [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8427/shard-skl5/igt@kms_hdr@bpc-switch.html [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17580/shard-skl9/igt@kms_hdr@bpc-switch.html * igt@kms_plane_alpha_blend@pipe-a-coverage-7efc: - shard-skl: [PASS][21] -> [FAIL][22] ([fdo#108145] / [i915#265]) [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8427/shard-skl7/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17580/shard-skl4/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html * igt@kms_psr@psr2_primary_mmap_cpu: - shard-iclb: [PASS][23] -> [SKIP][24] ([fdo#109441]) +3 similar issues [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8427/shard-iclb2/igt@kms_psr@psr2_primary_mmap_cpu.html [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17580/shard-iclb1/igt@kms_psr@psr2_primary_mmap_cpu.html #### Possible fixes #### * igt@gem_ctx_persistence@engines-mixed-process@vecs0: - shard-skl: [FAIL][25] ([i915#1528]) -> [PASS][26] [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8427/shard-skl6/igt@gem_ctx_persistence@engines-mixed-process@vecs0.html [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17580/shard-skl8/igt@gem_ctx_persistence@engines-mixed-process@vecs0.html * {igt@kms_flip@flip-vs-expired-vblank-interruptible@a-dp1}: - shard-apl: [FAIL][27] ([i915#79]) -> [PASS][28] [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8427/shard-apl1/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-dp1.html [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17580/shard-apl1/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-dp1.html * {igt@kms_flip@flip-vs-suspend-interruptible@a-dp1}: - shard-apl: [DMESG-WARN][29] ([i915#180]) -> [PASS][30] +2 similar issues [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8427/shard-apl4/igt@kms_flip@flip-vs-suspend-interruptible@a-dp1.html [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17580/shard-apl7/igt@kms_flip@flip-vs-suspend-interruptible@a-dp1.html * {igt@kms_flip@flip-vs-suspend@c-dp1}: - shard-kbl: [DMESG-WARN][31] ([i915#180]) -> [PASS][32] +5 similar issues [31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8427/shard-kbl4/igt@kms_flip@flip-vs-suspend@c-dp1.html [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17580/shard-kbl7/igt@kms_flip@flip-vs-suspend@c-dp1.html * igt@kms_frontbuffer_tracking@fbc-suspend: - shard-kbl: [DMESG-WARN][33] ([i915#180] / [i915#93] / [i915#95]) -> [PASS][34] [33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8427/shard-kbl4/igt@kms_frontbuffer_tracking@fbc-suspend.html [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17580/shard-kbl6/igt@kms_frontbuffer_tracking@fbc-suspend.html * igt@kms_plane_alpha_blend@pipe-c-coverage-7efc: - shard-skl: [FAIL][35] ([fdo#108145] / [i915#265]) -> [PASS][36] [35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8427/shard-skl8/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17580/shard-skl3/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html * igt@kms_psr@no_drrs: - shard-iclb: [FAIL][37] ([i915#173]) -> [PASS][38] [37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8427/shard-iclb1/igt@kms_psr@no_drrs.html [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17580/shard-iclb4/igt@kms_psr@no_drrs.html * igt@kms_psr@psr2_cursor_plane_onoff: - shard-iclb: [SKIP][39] ([fdo#109441]) -> [PASS][40] +3 similar issues [39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8427/shard-iclb3/igt@kms_psr@psr2_cursor_plane_onoff.html [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17580/shard-iclb2/igt@kms_psr@psr2_cursor_plane_onoff.html * igt@kms_setmode@basic: - shard-glk: [FAIL][41] ([i915#31]) -> [PASS][42] [41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8427/shard-glk9/igt@kms_setmode@basic.html [42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17580/shard-glk4/igt@kms_setmode@basic.html * {igt@perf@polling-parameterized}: - shard-tglb: [FAIL][43] ([i915#1542]) -> [PASS][44] [43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8427/shard-tglb7/igt@perf@polling-parameterized.html [44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17580/shard-tglb1/igt@perf@polling-parameterized.html #### Warnings #### * igt@i915_pm_dc@dc3co-vpb-simulation: - shard-iclb: [SKIP][45] ([i915#588]) -> [SKIP][46] ([i915#658]) [45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8427/shard-iclb2/igt@i915_pm_dc@dc3co-vpb-simulation.html [46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17580/shard-iclb6/igt@i915_pm_dc@dc3co-vpb-simulation.html * igt@i915_pm_dc@dc6-dpms: - shard-tglb: [SKIP][47] ([i915#468]) -> [FAIL][48] ([i915#454]) [47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8427/shard-tglb2/igt@i915_pm_dc@dc6-dpms.html [48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17580/shard-tglb7/igt@i915_pm_dc@dc6-dpms.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#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441 [i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188 [i915#1528]: https://gitlab.freedesktop.org/drm/intel/issues/1528 [i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542 [i915#173]: https://gitlab.freedesktop.org/drm/intel/issues/173 [i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180 [i915#198]: https://gitlab.freedesktop.org/drm/intel/issues/198 [i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265 [i915#300]: https://gitlab.freedesktop.org/drm/intel/issues/300 [i915#31]: https://gitlab.freedesktop.org/drm/intel/issues/31 [i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454 [i915#468]: https://gitlab.freedesktop.org/drm/intel/issues/468 [i915#49]: https://gitlab.freedesktop.org/drm/intel/issues/49 [i915#588]: https://gitlab.freedesktop.org/drm/intel/issues/588 [i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658 [i915#69]: https://gitlab.freedesktop.org/drm/intel/issues/69 [i915#70]: https://gitlab.freedesktop.org/drm/intel/issues/70 [i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79 [i915#93]: https://gitlab.freedesktop.org/drm/intel/issues/93 [i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95 [i915#96]: https://gitlab.freedesktop.org/drm/intel/issues/96 Participating hosts (10 -> 10) ------------------------------ No changes in participating hosts Build changes ------------- * CI: CI-20190529 -> None * Linux: CI_DRM_8427 -> Patchwork_17580 CI-20190529: 20190529 CI_DRM_8427: d7afe86abe766f68e758be1c9db6618e55bdf38d @ git://anongit.freedesktop.org/gfx-ci/linux IGT_5632: e630cb8cd2ec01d6d5358eb2a3f6ea70498b8183 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools Patchwork_17580: 92e7b4e3f924ed7fd4d57f69f156573ac43684cb @ 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_17580/index.html _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-05-05 20:09 UTC | newest] Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-05-05 8:46 [Intel-gfx] [CI] drm/i915/execlists: Record the active CCID from before reset Chris Wilson 2020-05-05 10:46 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork 2020-05-05 20:09 ` [Intel-gfx] ✓ Fi.CI.IGT: " 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.