* [PATCH] drm/i915/gt: Only unwedge if we can reset first
@ 2019-09-27 16:03 Chris Wilson
2019-09-27 16:57 ` ✓ Fi.CI.BAT: success for drm/i915/gt: Only unwedge if we can reset first (rev2) Patchwork
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Chris Wilson @ 2019-09-27 16:03 UTC (permalink / raw)
To: intel-gfx
Unwedging the GPU requires a successful GPU reset before we restore the
default submission, or else we may see residual context switch events
that we were not expecting.
v2: Pull in the special-case reset_clobbers_display, and explain why it
should be safe in the context of unwedging.
v3: Just forget all about resets before unwedging if it will clobber the
display; risk it all.
Reported-by: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> #v1
---
drivers/gpu/drm/i915/gt/intel_reset.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c
index d08226f5bea5..11781a626f75 100644
--- a/drivers/gpu/drm/i915/gt/intel_reset.c
+++ b/drivers/gpu/drm/i915/gt/intel_reset.c
@@ -807,6 +807,7 @@ static bool __intel_gt_unset_wedged(struct intel_gt *gt)
struct intel_gt_timelines *timelines = >->timelines;
struct intel_timeline *tl;
unsigned long flags;
+ bool ok;
if (!test_bit(I915_WEDGED, >->reset.flags))
return true;
@@ -853,7 +854,12 @@ static bool __intel_gt_unset_wedged(struct intel_gt *gt)
}
spin_unlock_irqrestore(&timelines->lock, flags);
- intel_gt_sanitize(gt, false);
+ /* We must reset pending GPU events before restoring our submission */
+ ok = !HAS_EXECLISTS(gt->i915);
+ if (!INTEL_INFO(gt->i915)->gpu_reset_clobbers_display)
+ ok = __intel_gt_reset(gt, ALL_ENGINES) == 0;
+ if (!ok)
+ return false;
/*
* Undo nop_submit_request. We prevent all new i915 requests from
--
2.23.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 4+ messages in thread* ✓ Fi.CI.BAT: success for drm/i915/gt: Only unwedge if we can reset first (rev2) 2019-09-27 16:03 [PATCH] drm/i915/gt: Only unwedge if we can reset first Chris Wilson @ 2019-09-27 16:57 ` Patchwork 2019-09-28 7:16 ` ✓ Fi.CI.IGT: " Patchwork 2019-10-01 8:23 ` [PATCH] drm/i915/gt: Only unwedge if we can reset first Janusz Krzysztofik 2 siblings, 0 replies; 4+ messages in thread From: Patchwork @ 2019-09-27 16:57 UTC (permalink / raw) To: Chris Wilson; +Cc: intel-gfx == Series Details == Series: drm/i915/gt: Only unwedge if we can reset first (rev2) URL : https://patchwork.freedesktop.org/series/66637/ State : success == Summary == CI Bug Log - changes from CI_DRM_6969 -> Patchwork_14567 ==================================================== Summary ------- **SUCCESS** No regressions found. External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14567/index.html Known issues ------------ Here are the changes found in Patchwork_14567 that come from known issues: ### IGT changes ### #### Issues hit #### * igt@gem_exec_suspend@basic: - fi-icl-u2: [PASS][1] -> [FAIL][2] ([fdo#111699]) [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6969/fi-icl-u2/igt@gem_exec_suspend@basic.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14567/fi-icl-u2/igt@gem_exec_suspend@basic.html * igt@gem_mmap@basic-small-bo: - fi-icl-u3: [PASS][3] -> [DMESG-WARN][4] ([fdo#107724]) +1 similar issue [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6969/fi-icl-u3/igt@gem_mmap@basic-small-bo.html [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14567/fi-icl-u3/igt@gem_mmap@basic-small-bo.html #### Possible fixes #### * igt@gem_ctx_switch@legacy-render: - fi-bxt-dsi: [INCOMPLETE][5] ([fdo#103927] / [fdo#111381]) -> [PASS][6] [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6969/fi-bxt-dsi/igt@gem_ctx_switch@legacy-render.html [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14567/fi-bxt-dsi/igt@gem_ctx_switch@legacy-render.html * igt@gem_exec_suspend@basic-s3: - fi-blb-e6850: [INCOMPLETE][7] ([fdo#107718]) -> [PASS][8] [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6969/fi-blb-e6850/igt@gem_exec_suspend@basic-s3.html [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14567/fi-blb-e6850/igt@gem_exec_suspend@basic-s3.html * igt@gem_mmap@basic: - fi-icl-u3: [DMESG-WARN][9] ([fdo#107724]) -> [PASS][10] +1 similar issue [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6969/fi-icl-u3/igt@gem_mmap@basic.html [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14567/fi-icl-u3/igt@gem_mmap@basic.html * igt@i915_module_load@reload: - fi-icl-u3: [DMESG-WARN][11] ([fdo#107724] / [fdo#111214]) -> [PASS][12] [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6969/fi-icl-u3/igt@i915_module_load@reload.html [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14567/fi-icl-u3/igt@i915_module_load@reload.html * igt@i915_pm_rpm@basic-pci-d3-state: - fi-skl-6600u: [FAIL][13] ([fdo#107707]) -> [PASS][14] [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6969/fi-skl-6600u/igt@i915_pm_rpm@basic-pci-d3-state.html [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14567/fi-skl-6600u/igt@i915_pm_rpm@basic-pci-d3-state.html * igt@kms_chamelium@hdmi-hpd-fast: - fi-kbl-7500u: [FAIL][15] ([fdo#111407]) -> [PASS][16] [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6969/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14567/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html {name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE). [fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927 [fdo#107707]: https://bugs.freedesktop.org/show_bug.cgi?id=107707 [fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718 [fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724 [fdo#111045]: https://bugs.freedesktop.org/show_bug.cgi?id=111045 [fdo#111096]: https://bugs.freedesktop.org/show_bug.cgi?id=111096 [fdo#111214]: https://bugs.freedesktop.org/show_bug.cgi?id=111214 [fdo#111381]: https://bugs.freedesktop.org/show_bug.cgi?id=111381 [fdo#111407]: https://bugs.freedesktop.org/show_bug.cgi?id=111407 [fdo#111647]: https://bugs.freedesktop.org/show_bug.cgi?id=111647 [fdo#111699]: https://bugs.freedesktop.org/show_bug.cgi?id=111699 Participating hosts (51 -> 46) ------------------------------ Additional (2): fi-hsw-peppy fi-skl-guc Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-icl-y fi-byt-clapper fi-bdw-samus Build changes ------------- * CI: CI-20190529 -> None * Linux: CI_DRM_6969 -> Patchwork_14567 CI-20190529: 20190529 CI_DRM_6969: ad0d6a2a5bb90cccef673bf3722a8ee08647cf7f @ git://anongit.freedesktop.org/gfx-ci/linux IGT_5206: 5a6c68568def840cd720f18fc66f529a89f84675 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools Patchwork_14567: 8d355db806fe7fdfbcace7ddc4fabfd7e7e052ed @ git://anongit.freedesktop.org/gfx-ci/linux == Linux commits == 8d355db806fe drm/i915/gt: Only unwedge if we can reset first == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14567/index.html _______________________________________________ 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
* ✓ Fi.CI.IGT: success for drm/i915/gt: Only unwedge if we can reset first (rev2) 2019-09-27 16:03 [PATCH] drm/i915/gt: Only unwedge if we can reset first Chris Wilson 2019-09-27 16:57 ` ✓ Fi.CI.BAT: success for drm/i915/gt: Only unwedge if we can reset first (rev2) Patchwork @ 2019-09-28 7:16 ` Patchwork 2019-10-01 8:23 ` [PATCH] drm/i915/gt: Only unwedge if we can reset first Janusz Krzysztofik 2 siblings, 0 replies; 4+ messages in thread From: Patchwork @ 2019-09-28 7:16 UTC (permalink / raw) To: Chris Wilson; +Cc: intel-gfx == Series Details == Series: drm/i915/gt: Only unwedge if we can reset first (rev2) URL : https://patchwork.freedesktop.org/series/66637/ State : success == Summary == CI Bug Log - changes from CI_DRM_6969_full -> Patchwork_14567_full ==================================================== Summary ------- **SUCCESS** No regressions found. Known issues ------------ Here are the changes found in Patchwork_14567_full that come from known issues: ### IGT changes ### #### Issues hit #### * igt@gem_exec_async@concurrent-writes-bsd: - shard-iclb: [PASS][1] -> [SKIP][2] ([fdo#111325]) [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6969/shard-iclb6/igt@gem_exec_async@concurrent-writes-bsd.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14567/shard-iclb4/igt@gem_exec_async@concurrent-writes-bsd.html * igt@gem_exec_schedule@preempt-queue-bsd2: - shard-iclb: [PASS][3] -> [SKIP][4] ([fdo#109276]) +14 similar issues [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6969/shard-iclb1/igt@gem_exec_schedule@preempt-queue-bsd2.html [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14567/shard-iclb5/igt@gem_exec_schedule@preempt-queue-bsd2.html * igt@gem_pread@snoop: - shard-apl: [PASS][5] -> [INCOMPLETE][6] ([fdo#103927]) +1 similar issue [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6969/shard-apl3/igt@gem_pread@snoop.html [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14567/shard-apl4/igt@gem_pread@snoop.html * igt@kms_flip@2x-flip-vs-dpms-interruptible: - shard-hsw: [PASS][7] -> [INCOMPLETE][8] ([fdo#103540]) [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6969/shard-hsw6/igt@kms_flip@2x-flip-vs-dpms-interruptible.html [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14567/shard-hsw4/igt@kms_flip@2x-flip-vs-dpms-interruptible.html * igt@kms_flip@flip-vs-expired-vblank: - shard-skl: [PASS][9] -> [FAIL][10] ([fdo#105363]) [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6969/shard-skl8/igt@kms_flip@flip-vs-expired-vblank.html [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14567/shard-skl2/igt@kms_flip@flip-vs-expired-vblank.html * igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-blt: - shard-iclb: [PASS][11] -> [FAIL][12] ([fdo#103167]) +5 similar issues [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6969/shard-iclb1/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-blt.html [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14567/shard-iclb5/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-blt.html * igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes: - shard-apl: [PASS][13] -> [DMESG-WARN][14] ([fdo#108566]) +3 similar issues [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6969/shard-apl4/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes.html [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14567/shard-apl3/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes.html * igt@kms_psr@psr2_primary_mmap_cpu: - shard-iclb: [PASS][15] -> [SKIP][16] ([fdo#109441]) +2 similar issues [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6969/shard-iclb2/igt@kms_psr@psr2_primary_mmap_cpu.html [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14567/shard-iclb8/igt@kms_psr@psr2_primary_mmap_cpu.html * igt@perf@polling: - shard-skl: [PASS][17] -> [FAIL][18] ([fdo#110728]) [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6969/shard-skl6/igt@perf@polling.html [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14567/shard-skl7/igt@perf@polling.html * igt@sw_sync@sync_expired_merge: - shard-iclb: [PASS][19] -> [INCOMPLETE][20] ([fdo#107713]) [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6969/shard-iclb7/igt@sw_sync@sync_expired_merge.html [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14567/shard-iclb7/igt@sw_sync@sync_expired_merge.html #### Possible fixes #### * igt@gem_ctx_shared@exec-single-timeline-bsd: - shard-iclb: [SKIP][21] ([fdo#110841]) -> [PASS][22] [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6969/shard-iclb4/igt@gem_ctx_shared@exec-single-timeline-bsd.html [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14567/shard-iclb7/igt@gem_ctx_shared@exec-single-timeline-bsd.html * igt@gem_exec_schedule@preemptive-hang-bsd: - shard-iclb: [SKIP][23] ([fdo#111325]) -> [PASS][24] +8 similar issues [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6969/shard-iclb4/igt@gem_exec_schedule@preemptive-hang-bsd.html [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14567/shard-iclb3/igt@gem_exec_schedule@preemptive-hang-bsd.html * igt@gem_workarounds@suspend-resume-context: - shard-apl: [DMESG-WARN][25] ([fdo#108566]) -> [PASS][26] +3 similar issues [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6969/shard-apl6/igt@gem_workarounds@suspend-resume-context.html [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14567/shard-apl5/igt@gem_workarounds@suspend-resume-context.html * igt@i915_pm_rpm@system-suspend-execbuf: - shard-iclb: [DMESG-WARN][27] -> [PASS][28] [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6969/shard-iclb8/igt@i915_pm_rpm@system-suspend-execbuf.html [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14567/shard-iclb4/igt@i915_pm_rpm@system-suspend-execbuf.html * igt@kms_flip_tiling@flip-to-x-tiled: - shard-iclb: [FAIL][29] ([fdo#108134]) -> [PASS][30] [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6969/shard-iclb6/igt@kms_flip_tiling@flip-to-x-tiled.html [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14567/shard-iclb2/igt@kms_flip_tiling@flip-to-x-tiled.html * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-shrfb-plflip-blt: - shard-iclb: [FAIL][31] ([fdo#103167]) -> [PASS][32] +3 similar issues [31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6969/shard-iclb1/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-shrfb-plflip-blt.html [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14567/shard-iclb5/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-shrfb-plflip-blt.html * igt@kms_plane_alpha_blend@pipe-a-coverage-7efc: - shard-skl: [FAIL][33] ([fdo#108145]) -> [PASS][34] [33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6969/shard-skl9/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14567/shard-skl1/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html * igt@kms_psr2_su@frontbuffer: - shard-iclb: [SKIP][35] ([fdo#109642] / [fdo#111068]) -> [PASS][36] [35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6969/shard-iclb6/igt@kms_psr2_su@frontbuffer.html [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14567/shard-iclb2/igt@kms_psr2_su@frontbuffer.html * igt@kms_psr@psr2_sprite_plane_move: - shard-iclb: [SKIP][37] ([fdo#109441]) -> [PASS][38] +2 similar issues [37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6969/shard-iclb4/igt@kms_psr@psr2_sprite_plane_move.html [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14567/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html * igt@kms_vblank@pipe-c-ts-continuation-suspend: - shard-iclb: [DMESG-WARN][39] ([fdo#111764]) -> [PASS][40] [39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6969/shard-iclb2/igt@kms_vblank@pipe-c-ts-continuation-suspend.html [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14567/shard-iclb4/igt@kms_vblank@pipe-c-ts-continuation-suspend.html * igt@perf@blocking: - shard-skl: [FAIL][41] ([fdo#110728]) -> [PASS][42] [41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6969/shard-skl7/igt@perf@blocking.html [42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14567/shard-skl10/igt@perf@blocking.html * igt@prime_vgem@fence-wait-bsd2: - shard-iclb: [SKIP][43] ([fdo#109276]) -> [PASS][44] +20 similar issues [43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6969/shard-iclb6/igt@prime_vgem@fence-wait-bsd2.html [44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14567/shard-iclb4/igt@prime_vgem@fence-wait-bsd2.html #### Warnings #### * igt@gem_ctx_isolation@vcs1-nonpriv: - shard-iclb: [FAIL][45] ([fdo#111329]) -> [SKIP][46] ([fdo#109276]) [45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6969/shard-iclb4/igt@gem_ctx_isolation@vcs1-nonpriv.html [46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14567/shard-iclb7/igt@gem_ctx_isolation@vcs1-nonpriv.html * igt@gem_mocs_settings@mocs-rc6-bsd2: - shard-iclb: [SKIP][47] ([fdo#109276]) -> [FAIL][48] ([fdo#111330]) [47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6969/shard-iclb3/igt@gem_mocs_settings@mocs-rc6-bsd2.html [48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14567/shard-iclb2/igt@gem_mocs_settings@mocs-rc6-bsd2.html * igt@kms_content_protection@atomic: - shard-apl: [INCOMPLETE][49] ([fdo#103927]) -> [FAIL][50] ([fdo#110321] / [fdo#110336]) [49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6969/shard-apl4/igt@kms_content_protection@atomic.html [50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14567/shard-apl6/igt@kms_content_protection@atomic.html {name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE). [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167 [fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540 [fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927 [fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363 [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713 [fdo#108134]: https://bugs.freedesktop.org/show_bug.cgi?id=108134 [fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145 [fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566 [fdo#108972]: https://bugs.freedesktop.org/show_bug.cgi?id=108972 [fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276 [fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441 [fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642 [fdo#110321]: https://bugs.freedesktop.org/show_bug.cgi?id=110321 [fdo#110336]: https://bugs.freedesktop.org/show_bug.cgi?id=110336 [fdo#110548]: https://bugs.freedesktop.org/show_bug.cgi?id=110548 [fdo#110728]: https://bugs.freedesktop.org/show_bug.cgi?id=110728 [fdo#110841]: https://bugs.freedesktop.org/show_bug.cgi?id=110841 [fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068 [fdo#111325]: https://bugs.freedesktop.org/show_bug.cgi?id=111325 [fdo#111329]: https://bugs.freedesktop.org/show_bug.cgi?id=111329 [fdo#111330]: https://bugs.freedesktop.org/show_bug.cgi?id=111330 [fdo#111764]: https://bugs.freedesktop.org/show_bug.cgi?id=111764 Participating hosts (16 -> 10) ------------------------------ Missing (6): shard-tglb1 shard-tglb2 shard-tglb3 shard-tglb4 shard-tglb5 shard-tglb6 Build changes ------------- * CI: CI-20190529 -> None * Linux: CI_DRM_6969 -> Patchwork_14567 CI-20190529: 20190529 CI_DRM_6969: ad0d6a2a5bb90cccef673bf3722a8ee08647cf7f @ git://anongit.freedesktop.org/gfx-ci/linux IGT_5206: 5a6c68568def840cd720f18fc66f529a89f84675 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools Patchwork_14567: 8d355db806fe7fdfbcace7ddc4fabfd7e7e052ed @ 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_14567/ _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915/gt: Only unwedge if we can reset first 2019-09-27 16:03 [PATCH] drm/i915/gt: Only unwedge if we can reset first Chris Wilson 2019-09-27 16:57 ` ✓ Fi.CI.BAT: success for drm/i915/gt: Only unwedge if we can reset first (rev2) Patchwork 2019-09-28 7:16 ` ✓ Fi.CI.IGT: " Patchwork @ 2019-10-01 8:23 ` Janusz Krzysztofik 2 siblings, 0 replies; 4+ messages in thread From: Janusz Krzysztofik @ 2019-10-01 8:23 UTC (permalink / raw) To: Chris Wilson; +Cc: intel-gfx Hi Chris, On Friday, September 27, 2019 6:03:35 PM CEST Chris Wilson wrote: > Unwedging the GPU requires a successful GPU reset before we restore the > default submission, or else we may see residual context switch events > that we were not expecting. > > v2: Pull in the special-case reset_clobbers_display, and explain why it > should be safe in the context of unwedging. > > v3: Just forget all about resets before unwedging if it will clobber the > display; risk it all. AFAICU, the risk we take is, when running on hardware with support for execlists, if reset clobbers the display we never unwedge, even if maybe we could. On the other hand, when running on hardware which doesn't support execlists, we optimistically unwedge unless we can try the reset and it fails. Assuming the issue we are trying to fix here is specific to execlists mode, that seems to be a safe choice. Thanks, Janusz > Reported-by: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com> > Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> #v1 > --- > drivers/gpu/drm/i915/gt/intel_reset.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/ gt/intel_reset.c > index d08226f5bea5..11781a626f75 100644 > --- a/drivers/gpu/drm/i915/gt/intel_reset.c > +++ b/drivers/gpu/drm/i915/gt/intel_reset.c > @@ -807,6 +807,7 @@ static bool __intel_gt_unset_wedged(struct intel_gt *gt) > struct intel_gt_timelines *timelines = >->timelines; > struct intel_timeline *tl; > unsigned long flags; > + bool ok; > > if (!test_bit(I915_WEDGED, >->reset.flags)) > return true; > @@ -853,7 +854,12 @@ static bool __intel_gt_unset_wedged(struct intel_gt *gt) > } > spin_unlock_irqrestore(&timelines->lock, flags); > > - intel_gt_sanitize(gt, false); > + /* We must reset pending GPU events before restoring our submission */ > + ok = !HAS_EXECLISTS(gt->i915); > + if (!INTEL_INFO(gt->i915)->gpu_reset_clobbers_display) > + ok = __intel_gt_reset(gt, ALL_ENGINES) == 0; > + if (!ok) > + return false; > > /* > * Undo nop_submit_request. We prevent all new i915 requests from > _______________________________________________ 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:[~2019-10-01 8:24 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-09-27 16:03 [PATCH] drm/i915/gt: Only unwedge if we can reset first Chris Wilson 2019-09-27 16:57 ` ✓ Fi.CI.BAT: success for drm/i915/gt: Only unwedge if we can reset first (rev2) Patchwork 2019-09-28 7:16 ` ✓ Fi.CI.IGT: " Patchwork 2019-10-01 8:23 ` [PATCH] drm/i915/gt: Only unwedge if we can reset first Janusz Krzysztofik
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.