drm/i915: Re-enable per-engine reset for Broxton
Subsystems (2)
PATCH 1/1 drm/i915: Re-enable per-engine reset for Broxton
The corruption in CSB mmio reads we were seeing has been tracked down to incorrectly touching forcewake of all domains, following an engine reset. It is still a mistery why we only catched this in Broxton, since it could happen in any platform.
With that fix already merged, commit 4055dc75d6b5 ("drm/i915: Stop touching forcewake following a gen6+ engine reset"), lets try to enable per-engine resets in Broxton one more time.
This reverts commit f188258bde0f ("drm/i915: Disable per-engine reset for Broxton").
--- drivers/gpu/drm/i915/i915_pci.c | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/i915/i915_pci.c +0 -1
@@ -400,7 +400,6 @@ static const struct intel_device_info intel_broxton_info = { GEN9_LP_FEATURES, .platform = INTEL_BROXTON, .ddb_size = 512, - .has_reset_engine = false, };static const struct intel_device_info intel_geminilake_info = {
Signature · 6 lines
2.14.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: Re-enable per-engine reset for Broxton
== Series Details ==
== Series Details ==
Series: drm/i915: Re-enable per-engine reset for Broxton
URL : https://patchwork.freedesktop.org/series/29011/
State : success
== Summary ==
Series 29011v1 drm/i915: Re-enable per-engine reset for Broxton
https://patchwork.freedesktop.org/api/1.0/series/29011/revisions/1/mbox/
Test kms_flip:
Subgroup basic-flip-vs-modeset:
pass -> SKIP (fi-skl-x1585l) fdo#101781fdo#101781 https://bugs.freedesktop.org/show_bug.cgi?id=101781
fi-bdw-5557u total:279 pass:268 dwarn:0 dfail:0 fail:0 skip:11 time:455s fi-bdw-gvtdvm total:279 pass:265 dwarn:0 dfail:0 fail:0 skip:14 time:441s fi-blb-e6850 total:279 pass:224 dwarn:1 dfail:0 fail:0 skip:54 time:362s fi-bsw-n3050 total:279 pass:243 dwarn:0 dfail:0 fail:0 skip:36 time:557s fi-bxt-j4205 total:279 pass:260 dwarn:0 dfail:0 fail:0 skip:19 time:522s fi-byt-j1900 total:279 pass:254 dwarn:1 dfail:0 fail:0 skip:24 time:525s fi-byt-n2820 total:279 pass:250 dwarn:1 dfail:0 fail:0 skip:28 time:523s fi-glk-2a total:279 pass:260 dwarn:0 dfail:0 fail:0 skip:19 time:610s fi-hsw-4770 total:279 pass:263 dwarn:0 dfail:0 fail:0 skip:16 time:444s fi-hsw-4770r total:279 pass:263 dwarn:0 dfail:0 fail:0 skip:16 time:424s fi-ilk-650 total:279 pass:229 dwarn:0 dfail:0 fail:0 skip:50 time:424s fi-ivb-3520m total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:514s fi-ivb-3770 total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:480s fi-kbl-7260u total:279 pass:267 dwarn:2 dfail:0 fail:0 skip:10 time:497s fi-kbl-7500u total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:477s fi-kbl-7560u total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:588s fi-kbl-r total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:599s fi-pnv-d510 total:279 pass:223 dwarn:1 dfail:0 fail:0 skip:55 time:527s fi-skl-6260u total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:475s fi-skl-6700k total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:476s fi-skl-6770hq total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:488s fi-skl-gvtdvm total:279 pass:266 dwarn:0 dfail:0 fail:0 skip:13 time:438s fi-skl-x1585l total:279 pass:268 dwarn:0 dfail:0 fail:0 skip:11 time:478s fi-snb-2520m total:279 pass:251 dwarn:0 dfail:0 fail:0 skip:28 time:556s fi-snb-2600 total:279 pass:250 dwarn:0 dfail:0 fail:0 skip:29 time:407s
0f7cfea3f630a146954506acc0e1d18097020cf2 drm-tip: 2017y-08m-18d-15h-11m-18s UTC integration manifest 7f0c9772b74d drm/i915: Re-enable per-engine reset for Broxton
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5441/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✓ Fi.CI.BAT: success for drm/i915: Re-enable per-engine reset for Broxton
Quoting Patchwork (2017-08-18 18:57:52)
Quoted 8 lines
== Series Details ==
Series: drm/i915: Re-enable per-engine reset for Broxton
URL : https://patchwork.freedesktop.org/series/29011/
State : success== Summary ==
Quoted 8 lines
Series 29011v1 drm/i915: Re-enable per-engine reset for Broxton
https://patchwork.freedesktop.org/api/1.0/series/29011/revisions/1/mbox/Test
kms_flip:Subgroup basic-flip-vs-modeset: pass -> SKIP (fi-skl-x1585l) fdo#101781fdo#101781 https://bugs.freedesktop.org/show_bug.cgi?id=101781
And pushed. That was a good find, that I am sure will have nipped some very troublesome issues in the bud. Thanks,
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Michel Thierry (2017-08-18 18:23:42)
Quoted 9 lines
The corruption in CSB mmio reads we were seeing has been tracked down to incorrectly touching forcewake of all domains, following an engine reset. It is still a mistery why we only catched this in Broxton, since it could happen in any platform.
With that fix already merged, commit
4055dc75d6b5("drm/i915: Stop touching forcewake following a gen6+ engine reset"), lets try to enable per-engine resets in Broxton one more time.
Quoted 5 lines
This reverts commit
f188258bde0f("drm/i915: Disable per-engine reset for Broxton").Cc Chris Wilson <[email protected]>Signed-off-by Michel Thierry <[email protected]>
My bxt has survived about 72 hours of hang testing, which is far more than it was able to previously.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Chris Wilson (2017-08-21 15:55:34)
Quoted 13 lines
Quoting Michel Thierry (2017-08-18 18:23:42)
Quoted 12 lines
The corruption in CSB mmio reads we were seeing has been tracked down to incorrectly touching forcewake of all domains, following an engine reset. It is still a mistery why we only catched this in Broxton, since it could happen in any platform.
With that fix already merged, commit
4055dc75d6b5("drm/i915: Stop touching forcewake following a gen6+ engine reset"), lets try to enable per-engine resets in Broxton one more time.This reverts commit
f188258bde0f("drm/i915: Disable per-engine reset for Broxton").
Quoted 8 lines
Quoted 2 lines
Cc Chris Wilson <[email protected]>Signed-off-by Michel Thierry <[email protected]>My bxt has survived about 72 hours of hang testing, which is far more than it was able to previously.
Acked-by Chris Wilson <[email protected]>Tested-by Chris Wilson <[email protected]>
Uh oh, seemingly just hit it again...
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 17 lines · Chris Wilson
Quoting Chris Wilson (2017-08-21 15:55:34)
Quoted 16 lines
Quoting Michel Thierry (2017-08-18 18:23:42)
Quoted 14 lines
The corruption in CSB mmio reads we were seeing has been tracked down to incorrectly touching forcewake of all domains, following an engine reset. It is still a mistery why we only catched this in Broxton, since it could happen in any platform.
With that fix already merged, commit
4055dc75d6b5("drm/i915: Stop touching forcewake following a gen6+ engine reset"), lets try to enable per-engine resets in Broxton one more time.This reverts commit
f188258bde0f("drm/i915: Disable per-engine reset for Broxton").Cc Chris Wilson <[email protected]>Signed-off-by Michel Thierry <[email protected]>
Quoted 7 lines
Quoted 5 lines
My bxt has survived about 72 hours of hang testing, which is far more than it was able to previously.
Acked-by Chris Wilson <[email protected]>Tested-by Chris Wilson <[email protected]>Uh oh, seemingly just hit it again...
Was it because the CSBs were 0's?
A couple of times I saw a spurious CSB event (0x12 - preempted & complete), after an already 'complete' event. That was also hitting the assert because the ctx-id would be 'wrong'. I think we could ignore the 0x12 event and it will continue.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Michel Thierry (2017-09-06 16:25:06)
Quoted 24 lines · Chris Wilson
Quoted 23 lines
Quoting Chris Wilson (2017-08-21 15:55:34)
Quoted 21 lines
Quoting Michel Thierry (2017-08-18 18:23:42)
Quoted 9 lines
The corruption in CSB mmio reads we were seeing has been tracked down to incorrectly touching forcewake of all domains, following an engine reset. It is still a mistery why we only catched this in Broxton, since it could happen in any platform.
With that fix already merged, commit
4055dc75d6b5("drm/i915: Stop touching forcewake following a gen6+ engine reset"), lets try to enable per-engine resets in Broxton one more time.Quoted 5 lines
This reverts commit
f188258bde0f("drm/i915: Disable per-engine reset for Broxton").Cc Chris Wilson <[email protected]>Signed-off-by Michel Thierry <[email protected]>My bxt has survived about 72 hours of hang testing, which is far more than it was able to previously.
Acked-by Chris Wilson <[email protected]>Tested-by Chris Wilson <[email protected]>
Quoted 8 lines
Quoted 1 line
Uh oh, seemingly just hit it again...
Was it because the CSBs were 0's?
A couple of times I saw a spurious CSB event (
0x12- preempted & complete), after an already 'complete' event. That was also hitting the assert because the ctx-id would be 'wrong'. I think we could ignore the0x12event and it will continue.
Hmm, that 0x12 event has never triggered the invalid ctx id yet for me (but that's probably just a matter of workload), it always hits the too-many-switches. Sadly we can't just continue on after that as the hw is completely out-of-sync with our submissions, and the only way to recover appears to be a gpu reset.
Anyway, haven't yet dug back into the bang, just reaffirmed that disabling per-engine resets gives me a
ickle@broxton:~$ uptime 16:55:31 up 1 day, 2:01, 2 users, load average: 3.66, 3.38, 3.3 so far of drv_selftest --r live_hanghceck -Chris _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx