* [Intel-gfx] [PATCH] drm/i915/gt: Only print an error if the resume fails after the reset
@ 2021-01-21 22:39 Chris Wilson
2021-01-22 4:26 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Chris Wilson @ 2021-01-21 22:39 UTC (permalink / raw)
To: intel-gfx; +Cc: Chris Wilson
If we fail to stop the ring before the reset, we try the reset anyway.
Then we only report a failure if the engine fails to resume after the
reset, therefore we don't need to print a premature error message during
the prepare.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/gt/intel_ring_submission.c | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_ring_submission.c b/drivers/gpu/drm/i915/gt/intel_ring_submission.c
index e4db4318f634..2d497ecdd433 100644
--- a/drivers/gpu/drm/i915/gt/intel_ring_submission.c
+++ b/drivers/gpu/drm/i915/gt/intel_ring_submission.c
@@ -333,8 +333,8 @@ static void reset_prepare(struct intel_engine_cs *engine)
ENGINE_TRACE(engine, "\n");
intel_engine_stop_cs(engine);
- if (!stop_ring(engine)) {
- /* G45 ring initialization often fails to reset head to zero */
+ /* G45 ring initialization often fails to reset head to zero */
+ if (!stop_ring(engine) && !stop_ring(engine))
ENGINE_TRACE(engine,
"HEAD not reset to zero, "
"{ CTL:%08x, HEAD:%08x, TAIL:%08x, START:%08x }\n",
@@ -342,17 +342,6 @@ static void reset_prepare(struct intel_engine_cs *engine)
ENGINE_READ_FW(engine, RING_HEAD),
ENGINE_READ_FW(engine, RING_TAIL),
ENGINE_READ_FW(engine, RING_START));
- if (!stop_ring(engine)) {
- drm_err(&engine->i915->drm,
- "failed to set %s head to zero "
- "ctl %08x head %08x tail %08x start %08x\n",
- engine->name,
- ENGINE_READ_FW(engine, RING_CTL),
- ENGINE_READ_FW(engine, RING_HEAD),
- ENGINE_READ_FW(engine, RING_TAIL),
- ENGINE_READ_FW(engine, RING_START));
- }
- }
}
static void reset_rewind(struct intel_engine_cs *engine, bool stalled)
--
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] 4+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/gt: Only print an error if the resume fails after the reset
2021-01-21 22:39 [Intel-gfx] [PATCH] drm/i915/gt: Only print an error if the resume fails after the reset Chris Wilson
@ 2021-01-22 4:26 ` Patchwork
2021-01-22 8:10 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2021-01-22 11:17 ` [Intel-gfx] [PATCH] " Mika Kuoppala
2 siblings, 0 replies; 4+ messages in thread
From: Patchwork @ 2021-01-22 4:26 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 3557 bytes --]
== Series Details ==
Series: drm/i915/gt: Only print an error if the resume fails after the reset
URL : https://patchwork.freedesktop.org/series/86159/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_9666 -> Patchwork_19452
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/index.html
Known issues
------------
Here are the changes found in Patchwork_19452 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_cs_nop@sync-gfx0:
- fi-bsw-n3050: NOTRUN -> [SKIP][1] ([fdo#109271]) +17 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/fi-bsw-n3050/igt@amdgpu/amd_cs_nop@sync-gfx0.html
* igt@gem_render_tiled_blits@basic:
- fi-tgl-y: [PASS][2] -> [DMESG-WARN][3] ([i915#402]) +1 similar issue
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/fi-tgl-y/igt@gem_render_tiled_blits@basic.html
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/fi-tgl-y/igt@gem_render_tiled_blits@basic.html
* igt@runner@aborted:
- fi-bdw-5557u: NOTRUN -> [FAIL][4] ([i915#1602] / [i915#2029] / [i915#2369])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/fi-bdw-5557u/igt@runner@aborted.html
#### Possible fixes ####
* igt@gem_tiled_blits@basic:
- fi-tgl-y: [DMESG-WARN][5] ([i915#402]) -> [PASS][6] +1 similar issue
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/fi-tgl-y/igt@gem_tiled_blits@basic.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/fi-tgl-y/igt@gem_tiled_blits@basic.html
* igt@i915_selftest@live@execlists:
- fi-bsw-n3050: [INCOMPLETE][7] ([i915#2940]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/fi-bsw-n3050/igt@i915_selftest@live@execlists.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/fi-bsw-n3050/igt@i915_selftest@live@execlists.html
* igt@i915_selftest@live@hangcheck:
- fi-byt-j1900: [DMESG-WARN][9] -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/fi-byt-j1900/igt@i915_selftest@live@hangcheck.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/fi-byt-j1900/igt@i915_selftest@live@hangcheck.html
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#1602]: https://gitlab.freedesktop.org/drm/intel/issues/1602
[i915#2029]: https://gitlab.freedesktop.org/drm/intel/issues/2029
[i915#2369]: https://gitlab.freedesktop.org/drm/intel/issues/2369
[i915#2940]: https://gitlab.freedesktop.org/drm/intel/issues/2940
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
Participating hosts (41 -> 37)
------------------------------
Missing (4): fi-ilk-m540 fi-bsw-cyan fi-bdw-samus fi-hsw-4200u
Build changes
-------------
* Linux: CI_DRM_9666 -> Patchwork_19452
CI-20190529: 20190529
CI_DRM_9666: 9ccbc653bf2948d1f7e9ff300dd7679b888ffa25 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5962: 22e3daaed82ab7890018a2f2aabf5082cd536023 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_19452: c1fe4d6df53c1908b698f3b98a071f5bd83955f1 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
c1fe4d6df53c drm/i915/gt: Only print an error if the resume fails after the reset
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/index.html
[-- Attachment #1.2: Type: text/html, Size: 4369 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] 4+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915/gt: Only print an error if the resume fails after the reset
2021-01-21 22:39 [Intel-gfx] [PATCH] drm/i915/gt: Only print an error if the resume fails after the reset Chris Wilson
2021-01-22 4:26 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
@ 2021-01-22 8:10 ` Patchwork
2021-01-22 11:17 ` [Intel-gfx] [PATCH] " Mika Kuoppala
2 siblings, 0 replies; 4+ messages in thread
From: Patchwork @ 2021-01-22 8:10 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 21324 bytes --]
== Series Details ==
Series: drm/i915/gt: Only print an error if the resume fails after the reset
URL : https://patchwork.freedesktop.org/series/86159/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_9666_full -> Patchwork_19452_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_19452_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_eio@in-flight-suspend:
- shard-kbl: [PASS][1] -> [INCOMPLETE][2] ([i915#1037])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-kbl7/igt@gem_eio@in-flight-suspend.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-kbl4/igt@gem_eio@in-flight-suspend.html
* igt@gem_exec_fair@basic-none@vcs0:
- shard-kbl: [PASS][3] -> [FAIL][4] ([i915#2842]) +3 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-kbl6/igt@gem_exec_fair@basic-none@vcs0.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-kbl2/igt@gem_exec_fair@basic-none@vcs0.html
* igt@gem_exec_fair@basic-pace@vecs0:
- shard-tglb: [PASS][5] -> [FAIL][6] ([i915#2842])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-tglb2/igt@gem_exec_fair@basic-pace@vecs0.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-tglb2/igt@gem_exec_fair@basic-pace@vecs0.html
* igt@gem_exec_fair@basic-throttle@rcs0:
- shard-glk: [PASS][7] -> [FAIL][8] ([i915#2842]) +1 similar issue
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-glk8/igt@gem_exec_fair@basic-throttle@rcs0.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-glk6/igt@gem_exec_fair@basic-throttle@rcs0.html
* igt@gem_exec_reloc@basic-wide-active@vcs1:
- shard-iclb: NOTRUN -> [FAIL][9] ([i915#2389])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-iclb2/igt@gem_exec_reloc@basic-wide-active@vcs1.html
* igt@gem_exec_schedule@u-fairslice-all:
- shard-skl: [PASS][10] -> [DMESG-WARN][11] ([i915#1610] / [i915#2803])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-skl3/igt@gem_exec_schedule@u-fairslice-all.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-skl2/igt@gem_exec_schedule@u-fairslice-all.html
* igt@gem_exec_schedule@u-fairslice@vecs0:
- shard-iclb: [PASS][12] -> [DMESG-WARN][13] ([i915#2803])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-iclb6/igt@gem_exec_schedule@u-fairslice@vecs0.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-iclb2/igt@gem_exec_schedule@u-fairslice@vecs0.html
* igt@gem_exec_whisper@basic-contexts-priority:
- shard-glk: [PASS][14] -> [DMESG-WARN][15] ([i915#118] / [i915#95])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-glk4/igt@gem_exec_whisper@basic-contexts-priority.html
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-glk2/igt@gem_exec_whisper@basic-contexts-priority.html
* igt@gem_vm_create@destroy-race:
- shard-tglb: [PASS][16] -> [TIMEOUT][17] ([i915#2795])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-tglb8/igt@gem_vm_create@destroy-race.html
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-tglb6/igt@gem_vm_create@destroy-race.html
* igt@i915_pm_dc@dc3co-vpb-simulation:
- shard-hsw: NOTRUN -> [SKIP][18] ([fdo#109271]) +67 similar issues
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-hsw6/igt@i915_pm_dc@dc3co-vpb-simulation.html
* igt@i915_pm_dc@dc5-psr:
- shard-skl: NOTRUN -> [CRASH][19] ([i915#2212])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-skl7/igt@i915_pm_dc@dc5-psr.html
* igt@i915_pm_rpm@modeset-non-lpsp-stress:
- shard-kbl: [PASS][20] -> [DMESG-WARN][21] ([i915#165] / [i915#180] / [i915#78])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-kbl6/igt@i915_pm_rpm@modeset-non-lpsp-stress.html
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-kbl2/igt@i915_pm_rpm@modeset-non-lpsp-stress.html
* igt@kms_ccs@pipe-c-bad-pixel-format:
- shard-skl: NOTRUN -> [SKIP][22] ([fdo#109271] / [fdo#111304])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-skl7/igt@kms_ccs@pipe-c-bad-pixel-format.html
* igt@kms_chamelium@common-hpd-after-suspend:
- shard-hsw: NOTRUN -> [SKIP][23] ([fdo#109271] / [fdo#111827]) +6 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-hsw1/igt@kms_chamelium@common-hpd-after-suspend.html
* igt@kms_chamelium@dp-edid-read:
- shard-glk: NOTRUN -> [SKIP][24] ([fdo#109271] / [fdo#111827]) +1 similar issue
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-glk9/igt@kms_chamelium@dp-edid-read.html
* igt@kms_color_chamelium@pipe-c-degamma:
- shard-skl: NOTRUN -> [SKIP][25] ([fdo#109271] / [fdo#111827]) +4 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-skl7/igt@kms_color_chamelium@pipe-c-degamma.html
* igt@kms_cursor_crc@pipe-a-cursor-128x42-sliding:
- shard-skl: [PASS][26] -> [FAIL][27] ([i915#54]) +4 similar issues
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-skl4/igt@kms_cursor_crc@pipe-a-cursor-128x42-sliding.html
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-skl7/igt@kms_cursor_crc@pipe-a-cursor-128x42-sliding.html
* igt@kms_cursor_crc@pipe-c-cursor-256x85-onscreen:
- shard-skl: NOTRUN -> [FAIL][28] ([i915#54])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-skl5/igt@kms_cursor_crc@pipe-c-cursor-256x85-onscreen.html
* igt@kms_cursor_edge_walk@pipe-a-128x128-right-edge:
- shard-skl: [PASS][29] -> [DMESG-WARN][30] ([i915#1982]) +1 similar issue
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-skl8/igt@kms_cursor_edge_walk@pipe-a-128x128-right-edge.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-skl3/igt@kms_cursor_edge_walk@pipe-a-128x128-right-edge.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1:
- shard-tglb: [PASS][31] -> [FAIL][32] ([i915#2598])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-tglb2/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-tglb1/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible@a-hdmi-a2:
- shard-glk: [PASS][33] -> [FAIL][34] ([i915#79]) +1 similar issue
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-glk9/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-hdmi-a2.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-glk1/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-hdmi-a2.html
* igt@kms_flip@plain-flip-fb-recreate@c-edp1:
- shard-skl: [PASS][35] -> [FAIL][36] ([i915#2122])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-skl9/igt@kms_flip@plain-flip-fb-recreate@c-edp1.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-skl3/igt@kms_flip@plain-flip-fb-recreate@c-edp1.html
* igt@kms_frontbuffer_tracking@psr-2p-primscrn-cur-indfb-draw-mmap-gtt:
- shard-glk: NOTRUN -> [SKIP][37] ([fdo#109271]) +5 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-glk9/igt@kms_frontbuffer_tracking@psr-2p-primscrn-cur-indfb-draw-mmap-gtt.html
* igt@kms_plane_alpha_blend@pipe-a-alpha-opaque-fb:
- shard-glk: NOTRUN -> [FAIL][38] ([fdo#108145] / [i915#265])
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-glk9/igt@kms_plane_alpha_blend@pipe-a-alpha-opaque-fb.html
* igt@kms_plane_alpha_blend@pipe-b-alpha-7efc:
- shard-skl: NOTRUN -> [FAIL][39] ([fdo#108145] / [i915#265])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-skl5/igt@kms_plane_alpha_blend@pipe-b-alpha-7efc.html
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [PASS][40] -> [FAIL][41] ([fdo#108145] / [i915#265])
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-skl4/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-skl7/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
* igt@kms_plane_cursor@pipe-b-viewport-size-128:
- shard-skl: NOTRUN -> [SKIP][42] ([fdo#109271]) +35 similar issues
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-skl7/igt@kms_plane_cursor@pipe-b-viewport-size-128.html
* igt@kms_psr@psr2_cursor_render:
- shard-iclb: [PASS][43] -> [SKIP][44] ([fdo#109441]) +1 similar issue
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-iclb2/igt@kms_psr@psr2_cursor_render.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-iclb6/igt@kms_psr@psr2_cursor_render.html
* igt@perf@blocking:
- shard-skl: [PASS][45] -> [FAIL][46] ([i915#1542])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-skl4/igt@perf@blocking.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-skl4/igt@perf@blocking.html
* igt@perf_pmu@module-unload:
- shard-skl: [PASS][47] -> [DMESG-WARN][48] ([i915#1982] / [i915#262])
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-skl9/igt@perf_pmu@module-unload.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-skl3/igt@perf_pmu@module-unload.html
#### Possible fixes ####
* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-glk: [FAIL][49] ([i915#2842]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-glk7/igt@gem_exec_fair@basic-pace-share@rcs0.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-glk9/igt@gem_exec_fair@basic-pace-share@rcs0.html
* igt@gem_exec_fair@basic-pace@bcs0:
- shard-tglb: [FAIL][51] ([i915#2842]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-tglb2/igt@gem_exec_fair@basic-pace@bcs0.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-tglb2/igt@gem_exec_fair@basic-pace@bcs0.html
* igt@gem_exec_fair@basic-pace@vcs1:
- shard-kbl: [SKIP][53] ([fdo#109271]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-kbl3/igt@gem_exec_fair@basic-pace@vcs1.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-kbl1/igt@gem_exec_fair@basic-pace@vcs1.html
* igt@gem_exec_fair@basic-throttle@rcs0:
- shard-iclb: [FAIL][55] ([i915#2849]) -> [PASS][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-iclb6/igt@gem_exec_fair@basic-throttle@rcs0.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-iclb2/igt@gem_exec_fair@basic-throttle@rcs0.html
* igt@gem_exec_schedule@u-fairslice@vecs0:
- shard-skl: [DMESG-WARN][57] ([i915#1610] / [i915#2803]) -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-skl1/igt@gem_exec_schedule@u-fairslice@vecs0.html
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-skl7/igt@gem_exec_schedule@u-fairslice@vecs0.html
* igt@gem_userptr_blits@huge-split:
- shard-glk: [INCOMPLETE][59] ([i915#2502]) -> [PASS][60]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-glk7/igt@gem_userptr_blits@huge-split.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-glk9/igt@gem_userptr_blits@huge-split.html
* igt@i915_pm_dc@dc6-psr:
- shard-iclb: [FAIL][61] ([i915#454]) -> [PASS][62]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-iclb4/igt@i915_pm_dc@dc6-psr.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-iclb3/igt@i915_pm_dc@dc6-psr.html
* igt@i915_selftest@live@hangcheck:
- shard-hsw: [INCOMPLETE][63] ([i915#2782]) -> [PASS][64]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-hsw2/igt@i915_selftest@live@hangcheck.html
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-hsw6/igt@i915_selftest@live@hangcheck.html
* igt@kms_async_flips@test-time-stamp:
- shard-tglb: [FAIL][65] ([i915#2597]) -> [PASS][66]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-tglb5/igt@kms_async_flips@test-time-stamp.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-tglb7/igt@kms_async_flips@test-time-stamp.html
* igt@kms_color@pipe-a-ctm-0-5:
- shard-skl: [DMESG-WARN][67] ([i915#1982]) -> [PASS][68] +1 similar issue
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-skl3/igt@kms_color@pipe-a-ctm-0-5.html
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-skl1/igt@kms_color@pipe-a-ctm-0-5.html
* igt@kms_cursor_crc@pipe-b-cursor-64x21-offscreen:
- shard-skl: [FAIL][69] ([i915#54]) -> [PASS][70] +6 similar issues
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-skl2/igt@kms_cursor_crc@pipe-b-cursor-64x21-offscreen.html
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-skl8/igt@kms_cursor_crc@pipe-b-cursor-64x21-offscreen.html
* igt@kms_cursor_legacy@2x-long-cursor-vs-flip-legacy:
- shard-hsw: [FAIL][71] ([i915#96]) -> [PASS][72]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-hsw1/igt@kms_cursor_legacy@2x-long-cursor-vs-flip-legacy.html
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-hsw4/igt@kms_cursor_legacy@2x-long-cursor-vs-flip-legacy.html
* igt@kms_cursor_legacy@long-nonblocking-modeset-vs-cursor-atomic:
- shard-kbl: [DMESG-WARN][73] ([i915#95]) -> [PASS][74]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-kbl7/igt@kms_cursor_legacy@long-nonblocking-modeset-vs-cursor-atomic.html
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-kbl3/igt@kms_cursor_legacy@long-nonblocking-modeset-vs-cursor-atomic.html
* igt@kms_flip@plain-flip-fb-recreate-interruptible@c-edp1:
- shard-skl: [FAIL][75] ([i915#2122]) -> [PASS][76] +4 similar issues
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-skl1/igt@kms_flip@plain-flip-fb-recreate-interruptible@c-edp1.html
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-skl4/igt@kms_flip@plain-flip-fb-recreate-interruptible@c-edp1.html
* igt@kms_psr@psr2_primary_page_flip:
- shard-iclb: [SKIP][77] ([fdo#109441]) -> [PASS][78] +1 similar issue
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-iclb6/igt@kms_psr@psr2_primary_page_flip.html
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-iclb2/igt@kms_psr@psr2_primary_page_flip.html
* igt@perf@polling-parameterized:
- shard-glk: [FAIL][79] ([i915#1542]) -> [PASS][80]
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-glk7/igt@perf@polling-parameterized.html
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-glk5/igt@perf@polling-parameterized.html
- shard-iclb: [FAIL][81] ([i915#1542]) -> [PASS][82]
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-iclb4/igt@perf@polling-parameterized.html
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-iclb4/igt@perf@polling-parameterized.html
#### Warnings ####
* igt@gem_exec_fair@basic-none-rrul@rcs0:
- shard-iclb: [FAIL][83] ([i915#2852]) -> [FAIL][84] ([i915#2842])
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-iclb7/igt@gem_exec_fair@basic-none-rrul@rcs0.html
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-iclb7/igt@gem_exec_fair@basic-none-rrul@rcs0.html
* igt@i915_pm_dc@dc3co-vpb-simulation:
- shard-iclb: [SKIP][85] ([i915#658]) -> [SKIP][86] ([i915#588])
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-iclb5/igt@i915_pm_dc@dc3co-vpb-simulation.html
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-iclb2/igt@i915_pm_dc@dc3co-vpb-simulation.html
* igt@kms_psr2_sf@cursor-plane-update-sf:
- shard-iclb: [SKIP][87] ([i915#2920]) -> [SKIP][88] ([i915#658]) +1 similar issue
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-iclb2/igt@kms_psr2_sf@cursor-plane-update-sf.html
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-iclb6/igt@kms_psr2_sf@cursor-plane-update-sf.html
* igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-2:
- shard-iclb: [SKIP][89] ([i915#658]) -> [SKIP][90] ([i915#2920]) +1 similar issue
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-iclb5/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-2.html
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-iclb2/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-2.html
* igt@runner@aborted:
- shard-iclb: [FAIL][91] ([i915#2295] / [i915#2724]) -> ([FAIL][92], [FAIL][93]) ([i915#2295] / [i915#2426] / [i915#2724])
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9666/shard-iclb4/igt@runner@aborted.html
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-iclb2/igt@runner@aborted.html
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19452/shard-iclb3/igt@runner@aborted.html
[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#111304]: https://bugs.freedesktop.org/show_bug.cgi?id=111304
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1037]: https://gitlab.freedesktop.org/drm/intel/issues/1037
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542
[i915#1610]: https://gitlab.freedesktop.org/drm/intel/issues/1610
[i915#165]: https://gitlab.freedesktop.org/drm/intel/issues/165
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2212]: https://gitlab.freedesktop.org/drm/intel/issues/2212
[i915#2295]: https://gitlab.freedesktop.org/drm/intel/issues/2295
[i915#2389]: https://gitlab.freedesktop.org/drm/intel/issues/2389
[i915#2426]: https://gitlab.freedesktop.org/drm/intel/issues/2426
[i915#2502]: https://gitlab.freedesktop.org/drm/intel/issues/2502
[i915#2597]: https://gitlab.freedesktop.org/drm/intel/issues/2597
[i915#2598]: https://gitlab.freedesktop.org/drm/intel/issues/2598
[i915#262]: https://gitlab.freedesktop.org/drm/intel/issues/262
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#2724]: https://gitlab.freedesktop.org/drm/intel/issues/2724
[i915#2782]: https://gitlab.freedesktop.org/drm/intel/issues/2782
[i915#2795]: https://gitlab.freedesktop.org/drm/intel/issues/2795
[i915#2803]: https://gitlab.freedesktop.org/drm/intel/issues/2803
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2849]: https://gitlab.freedesktop.org/drm/intel/issues/2849
[i915#2852]: https://gitlab.freedesktop.org/drm/intel/issues/2852
[i915#2920]: https://gitlab.freedesktop.org/drm/intel/issues/2920
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#588]: https://gitlab.freedesktop.org/drm/intel/issues/588
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#78]: https://gitlab.freedesktop.org/drm/intel/issues/78
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[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
-------------
* Linux: CI_DRM_9666 -> Patchwork_19452
CI-20190529: 20190529
CI_DRM_9666: 9ccbc653bf2948d1f7e9ff300dd7679b888ffa25 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5962: 22e3daaed82ab7890018a2f2aabf5082cd536023 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_19452: c1fe4d6df53c1908b698f3b98a071f5bd83955f1 @ 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_19452/index.html
[-- Attachment #1.2: Type: text/html, Size: 25526 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] 4+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/gt: Only print an error if the resume fails after the reset
2021-01-21 22:39 [Intel-gfx] [PATCH] drm/i915/gt: Only print an error if the resume fails after the reset Chris Wilson
2021-01-22 4:26 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
2021-01-22 8:10 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
@ 2021-01-22 11:17 ` Mika Kuoppala
2 siblings, 0 replies; 4+ messages in thread
From: Mika Kuoppala @ 2021-01-22 11:17 UTC (permalink / raw)
To: Chris Wilson, intel-gfx; +Cc: Chris Wilson
Chris Wilson <chris@chris-wilson.co.uk> writes:
> If we fail to stop the ring before the reset, we try the reset anyway.
> Then we only report a failure if the engine fails to resume after the
> reset, therefore we don't need to print a premature error message during
> the prepare.
Resonable to only yell if we cant proceed.
>
> 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_ring_submission.c | 15 ++-------------
> 1 file changed, 2 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_ring_submission.c b/drivers/gpu/drm/i915/gt/intel_ring_submission.c
> index e4db4318f634..2d497ecdd433 100644
> --- a/drivers/gpu/drm/i915/gt/intel_ring_submission.c
> +++ b/drivers/gpu/drm/i915/gt/intel_ring_submission.c
> @@ -333,8 +333,8 @@ static void reset_prepare(struct intel_engine_cs *engine)
> ENGINE_TRACE(engine, "\n");
> intel_engine_stop_cs(engine);
>
> - if (!stop_ring(engine)) {
> - /* G45 ring initialization often fails to reset head to zero */
> + /* G45 ring initialization often fails to reset head to zero */
> + if (!stop_ring(engine) && !stop_ring(engine))
> ENGINE_TRACE(engine,
> "HEAD not reset to zero, "
> "{ CTL:%08x, HEAD:%08x, TAIL:%08x, START:%08x }\n",
> @@ -342,17 +342,6 @@ static void reset_prepare(struct intel_engine_cs *engine)
> ENGINE_READ_FW(engine, RING_HEAD),
> ENGINE_READ_FW(engine, RING_TAIL),
> ENGINE_READ_FW(engine, RING_START));
> - if (!stop_ring(engine)) {
> - drm_err(&engine->i915->drm,
> - "failed to set %s head to zero "
> - "ctl %08x head %08x tail %08x start %08x\n",
> - engine->name,
> - ENGINE_READ_FW(engine, RING_CTL),
> - ENGINE_READ_FW(engine, RING_HEAD),
> - ENGINE_READ_FW(engine, RING_TAIL),
> - ENGINE_READ_FW(engine, RING_START));
> - }
> - }
> }
>
> static void reset_rewind(struct intel_engine_cs *engine, bool stalled)
> --
> 2.20.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
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:[~2021-01-22 11:20 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-21 22:39 [Intel-gfx] [PATCH] drm/i915/gt: Only print an error if the resume fails after the reset Chris Wilson
2021-01-22 4:26 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
2021-01-22 8:10 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2021-01-22 11:17 ` [Intel-gfx] [PATCH] " Mika Kuoppala
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.