Attachment 719189 Details for Bug 1029634

[patch] A test fix patch for 4.11-rc4 (revised)

0001-v2-drm-i915-Fix-crash-after-S3-resume-with-DP-MST-mode-.patch (text/plain), 2.33 KB, created by Takashi Iwai on 2017-03-29 16:11:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Takashi Iwai

Created: 2017-03-29 16:11:43 UTC

Size: 2.33 KB

patch

obsolete

>From e6bd4080a7bb6b7cc1a263f234dc5bd0ffc8dce6 Mon Sep 17 00:00:00 2001
>From: Takashi Iwai <tiwai@suse.de>
>Date: Wed, 29 Mar 2017 14:49:25 +0200
>Subject: [PATCH] drm/i915: Fix crash after S3 resume with DP MST mode change
> (v2)
>
>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").
>
>This patch tries to work around the crash by ignoring the failed port
>from drm_dp_mst_topology_mgr_resume().  They should be handled in hpd
>later in anyway.
>
>v1->v2: just ignore the drm_dp_mst_topology_mgr_resume() error codes
>        instead of postponing.
>
>Fixes: a16b7658f4e0 ("drm/i915: Call intel_dp_mst_resume() before resuming displays")
>Bugzilla: https://bugzilla.suse.com/show_bug.cgi?id=1029634
>Signed-off-by: Takashi Iwai <tiwai@suse.de>
>---
> drivers/gpu/drm/i915/intel_dp.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
>index d1670b8afbf5..a6c0f0ac16eb 100644
>--- a/drivers/gpu/drm/i915/intel_dp.c
>+++ b/drivers/gpu/drm/i915/intel_dp.c
>@@ -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));
> 	}
> }
>-- 
>2.11.1
>

Actions: View | Diff

Attachments on bug 1029634: 717661 | 717861 | 717883 | 719148 | 719149 | 719161 | 719189 | 721808