drm/i915: Fix crash after S3 resume with DP MST mode change
Subsystems (2)
PATCH 1/1 drm/i915: Fix crash after S3 resume with DP MST mode change
We've got a bug report showing that Skylake Dell machines with a docking station causes a kernel panic after S3 resume and modeset. The details are found in the openSUSE bugzilla entry below. The typical test procedure is:
- Laptop is Dell Latitude with eDP (1366x768)
- Boot with docking station connected to a DP (1920x1080)
- Login, change the mode via
xrandr --output eDP-1 --auto --output DP-1-1 --auto --left-of eDP-1
- Suspend, and close the lid after the suspend
(or close the lid to trigger the suspend)
- Undock while keeping the lid closed.
- Open the lid, which triggers the resume;
the machine wakes up well, and X shows up. No problem, so far.
- Suspend again, close the lid.
- Dock again while keeping the lid closed.
- Open the lid, triggering the resume; this wakes up still fine.
- At this moment, run xrandr again to re-setup DP-1
xrandr --output eDP-1 --auto --output DP-1-1 --auto --left-of eDP-1 ==> This triggers a hard crash.
I could bisect it, and this leaded to the commit a16b7658f4e0 ("drm/i915: Call intel_dp_mst_resume() before resuming displays").
Unfortunately, no crash dump / log could be taken because the machine gets screwed up including the whole network stack when it hits this problem, and neither kdump nor netconsole worked. So, currently it's still pretty unclear what really happened.
But, eventually I found a workaround: just skip drm_dp_mst_topology_mgr_resume() calls in intel_dp_mst_resume(). They should be handled in hpd later in anyway, so we can skip them gracefully.
This patch addresses the crash by the workaround above; for a completeness, the failed resume port is still logged in the debug level.
v1->v2: just ignore the drm_dp_mst_topology_mgr_resume() error codes
instead of postponing.
Bugzilla: https://bugzilla.suse.com/show_bug.cgi?id=1029634
--- drivers/gpu/drm/i915/intel_dp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_dp.c +2 -1
@@ -6041,6 +6041,7 @@ void intel_dp_mst_resume(struct drm_device *dev) ret =drm_dp_mst_topology_mgr_resume (&intel_dig_port->dp.mst_mgr);if (ret) -intel_dp_check_mst_status (&intel_dig_port->dp); +DRM_DEBUG_KMS ("DP MST resume failed for port-%c\n" , +port_name (intel_dig_port->port)); } }
Signature · 6 lines
2.11.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: Fix crash after S3 resume with DP MST mode change
== Series Details ==
== Series Details ==
Series: drm/i915: Fix crash after S3 resume with DP MST mode change
URL : https://patchwork.freedesktop.org/series/22225/
State : success
== Summary ==
Series 22225v1 drm/i915: Fix crash after S3 resume with DP MST mode change
https://patchwork.freedesktop.org/api/1.0/series/22225/revisions/1/mbox/
Test gem_exec_flush:
Subgroup basic-batch-kernel-default-uc:
pass -> FAIL (fi-snb-2600) fdo#100007
Test gem_exec_suspend:
Subgroup basic-s4-devices:
dmesg-warn -> PASS (fi-snb-2600) fdo#100125fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007
fdo#100125 https://bugs.freedesktop.org/show_bug.cgi?id=100125
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time: 433s fi-bdw-gvtdvm total:278 pass:256 dwarn:8 dfail:0 fail:0 skip:14 time: 430s fi-bsw-n3050 total:278 pass:239 dwarn:0 dfail:0 fail:0 skip:39 time: 576s fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time: 510s fi-bxt-t5700 total:278 pass:258 dwarn:0 dfail:0 fail:0 skip:20 time: 544s fi-byt-j1900 total:278 pass:251 dwarn:0 dfail:0 fail:0 skip:27 time: 483s fi-byt-n2820 total:278 pass:247 dwarn:0 dfail:0 fail:0 skip:31 time: 483s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time: 411s fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time: 406s fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time: 426s fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 490s fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 471s fi-kbl-7500u total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 454s fi-kbl-7560u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time: 568s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time: 455s fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 time: 570s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time: 467s fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time: 495s fi-skl-gvtdvm total:278 pass:265 dwarn:0 dfail:0 fail:0 skip:13 time: 430s fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time: 528s fi-snb-2600 total:278 pass:248 dwarn:0 dfail:0 fail:1 skip:29 time: 411s
80e8cddb7c01d1cf1dec04d58b1c0e51d77a6050 drm-tip: 2017y-03m-30d-14h-33m-10s UTC integration manifest 06ad73a drm/i915: Fix crash after S3 resume with DP MST mode change
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4367/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx