From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?Q?Toralf_F=c3=b6rster?= Subject: Re: 4.0.8->4.1.3 : after resume from s2ram both internal and external display of a docked ThinkPad ate black Date: Fri, 30 Oct 2015 10:38:18 +0100 Message-ID: <56333A8A.3000707@gmx.de> References: <55B8DAF8.6070805@gmx.de> <20150802074334.GG3720@amd> <55C0B038.8090807@gmx.de> <56115416.7040404@gmx.de> <20151029214933.GA18861@amd> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6005D88867 for ; Fri, 30 Oct 2015 02:38:26 -0700 (PDT) In-Reply-To: <20151029214933.GA18861@amd> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Dave Airlie Cc: intel-gfx , Linux Kernel , Pavel Machek List-Id: intel-gfx@lists.freedesktop.org T24gMTAvMjkvMjAxNSAxMDo0OSBQTSwgUGF2ZWwgTWFjaGVrIHdyb3RlOgo+IE9uIFN1biAyMDE1 LTEwLTA0IDE4OjMwOjE0LCBUb3JhbGYgRsO2cnN0ZXIgd3JvdGU6Cj4+IE9uIDA4LzA0LzIwMTUg MDI6MjkgUE0sIFRvcmFsZiBGw7Zyc3RlciB3cm90ZToKPj4+IE9uIDA4LzAyLzIwMTUgMDk6NDMg QU0sIFBhdmVsIE1hY2hlayB3cm90ZToKPj4+PiBBbnkgY2hhbmNlIHRvIGJpc2VjdCBpdD8KPj4+ IERpZCBpdC4KPj4+Cj4+PiBGV0lXOiB0aGUgbWVudGlvbmVkIGNvbW1pdCB3YXMgaW50cm9kdWNl ZCBiZXR3ZWVuIDMuMTggYW5kIDMuMTkuCj4+PiBCdXQgbXkgc3lzdGVtIChoYXJkZW5lZCA2NCBi aXQgR2VudG9vKSBkaWQgbm90IHN1ZmZlciBmcm9tIGl0IHRpbGwgdmVyc2lvbiA0LjAuOC4KPj4+ IFRoZSBoYXJkZW5lZCBrZXJuZWwgNC4xLnggd2FzIHRoZSBmaXJzdCB3aGVyZSB0aGUgYnVnIHdh cyB2aXNpYmxlIGF0IG15IGRvY2tlZCBlbnZpcm9ubWVudCAgdG9vLgo+Pj4KPj4+Cj4+Pgo+Pj4g Y29tbWl0IGU3ZDZmN2Q3MDgyOTBkYTFiN2M5MmY1MzM0NDRiMDQyYzc5NDEyZTAKPj4+IEF1dGhv cjogRGF2ZSBBaXJsaWUgPGFpcmxpZWRAcmVkaGF0LmNvbT4KPj4+IERhdGU6ICAgTW9uIERlYyA4 IDEzOjIzOjM3IDIwMTQgKzEwMDAKPj4+Cj4+PiAgICAgZHJtL2k5MTU6IHJlc3VtZSBNU1QgYWZ0 ZXIgcmVhZGluZyBiYWNrIGh3IHN0YXRlCj4+Pgo+Pj4gICAgIE90aGVyd2lzZSB0aGUgTVNUIHJl c3VtZSBwYXRocyBjYW4gaGl0IERQTVMgcGF0aHMKPj4+ICAgICB3aGljaCBoaXQgc3RhdGUgY2hl Y2tlciBwYXRocywgd2hpY2ggaGl0IFdBUk5fT04sCj4+PiAgICAgYmVjYXVzZSB0aGUgc3RhdGUg Y2hlY2tlciBpcyBpbmNvbnNpc3RlbnQgd2l0aCB0aGUKPj4+ICAgICBody4KPj4+Cj4+PiAgICAg VGhpcyBmaXhlcyBhIGJ1bmNoIG9mIFdBUk5fT04ncyBvbiByZXN1bWUgYWZ0ZXIKPj4+ICAgICB1 bmRvY2tpbmcuCj4+Pgo+Pj4gICAgIFNpZ25lZC1vZmYtYnk6IERhdmUgQWlybGllIDxhaXJsaWVk QHJlZGhhdC5jb20+Cj4+PiAgICAgUmV2aWV3ZWQtYnk6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52 ZXR0ZXJAZmZ3bGwuY2g+Cj4+PiAgICAgQ2M6IHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmcKPj4+ICAg ICBTaWduZWQtb2ZmLWJ5OiBKYW5pIE5pa3VsYSA8amFuaS5uaWt1bGFAaW50ZWwuY29tPgo+Pj4K Pj4KPj4gSXMgdGhlcmUgYW55dGhpbmcgZWxzZSB3aGF0IEkgY2FuIGRvID8KPj4KPj4gQ3VycmVu dCBrZXJuZWxzIHVwIHRvIDQuMi4zIGFuZCA0LjMtcmMzIChub3QgaGFyZGVuZWQpIHNob3dzIHRo aXMgaXNzdWUgaGVyZSBhdCBteSBzeXN0ZW0uCj4gCj4gWWVzLiBOb3cgeW91IGFzayBEYXZlIEFp cmxpZSA8YWlybGllZEByZWRoYXQuY29tPiB0byBmaXggaXQuIElmIHRoYXQKCkRlYXIgRGF2ZSwK CnBsZWFzZSBmaXggaXQuCgpIZXJlJ3MgYSB3b3JrIGFyb3VuZCB3aGljaCB3b3JrcyBmb3IgbWUg c2luY2Uga2VybmVsIDQuMS54IDoKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5jCmIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwppbmRleCBhYjY0ZDY4 Li4zYWVlYWQyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKQEAgLTc0MCw2ICs3NDAsOCBAQCBz dGF0aWMgaW50IGk5MTVfZHJtX3Jlc3VtZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogICAgICAg IGlmIChkZXZfcHJpdi0+ZGlzcGxheS5ocGRfaXJxX3NldHVwKQogICAgICAgICAgICAgICAgZGV2 X3ByaXYtPmRpc3BsYXkuaHBkX2lycV9zZXR1cChkZXYpOwogICAgICAgIHNwaW5fdW5sb2NrX2ly cSgmZGV2X3ByaXYtPmlycV9sb2NrKTsKKworICAgICAgIGludGVsX2RwX21zdF9yZXN1bWUoZGV2 KTsKCiAgICAgICAgZHJtX21vZGVzZXRfbG9ja19hbGwoZGV2KTsKICAgICAgICBpbnRlbF9kaXNw bGF5X3Jlc3VtZShkZXYpOwoKCj4gZG9lcyBub3Qgd29yaywgeW91IGFzayBoaW0gdG8gZml4IGl0 LCBpbiBsZXNzIHBvbGl0ZSB3b3Jkcy4gSWYgdGhhdAo+IGRvZXMgbm90IHdvcmssIHlvdSB2ZXJp ZnkgdGhhdCByZXZlcnRpbmcKPiBlN2Q2ZjdkNzA4MjkwZGExYjdjOTJmNTMzNDQ0YjA0MmM3OTQx MmUwIGZpeGVzIGl0IGZvciB5b3UsIHRoZW4gYXNrCj4gRGFuaWVsIFZldHRlciBhbmQgSmFuaSBO aWt1bGEgdG8gcmV2ZXJ0IGl0LiBJZiB0aGV5IGZhaWwgdG8gZG8gdGhhdCwKPiB5b3UgZ28gYWxs IHRoZSB3YXkgdXAgdG8gTGludXMuCj4gCj4gR29vZCBsdWNrIDstKSwgCj4gCQkJCQkJCQkJUGF2 ZWwKPiAKCgotLSAKVG9yYWxmLCBwZ3Aga2V5OiBDNEVBQ0RERSAwMDc2RTk0RQpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBs aXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030370AbbJ3Ji3 (ORCPT ); Fri, 30 Oct 2015 05:38:29 -0400 Received: from mout.gmx.net ([212.227.15.15]:58298 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965541AbbJ3Ji2 (ORCPT ); Fri, 30 Oct 2015 05:38:28 -0400 Subject: Re: 4.0.8->4.1.3 : after resume from s2ram both internal and external display of a docked ThinkPad ate black References: <55B8DAF8.6070805@gmx.de> <20150802074334.GG3720@amd> <55C0B038.8090807@gmx.de> <56115416.7040404@gmx.de> <20151029214933.GA18861@amd> Cc: Pavel Machek , intel-gfx , Linux Kernel To: Dave Airlie From: =?UTF-8?Q?Toralf_F=c3=b6rster?= Message-ID: <56333A8A.3000707@gmx.de> Date: Fri, 30 Oct 2015 10:38:18 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <20151029214933.GA18861@amd> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:U/d/+S/ebqkL3M48TlprlupywwqAxkawUupweiXlQuvaDavLOFI /s9rGQONyzGaCFYYyZ6UyzTnzFxIuN1GpwFwySnN8//54iS4lGfXODkrGoTnfEkqmZ5qmiX irJP15lQ0SJd/MQyuBV8sOC9Z+VlR0irevICOidqo57xTYFGzWS3fgA+hYV8bBHSGZak4lk oeXyPEQsz8NWnA7luEX2w== X-UI-Out-Filterresults: notjunk:1;V01:K0:dGMLHg2ysaI=:3yFPWKlZ6hxltmFBx/fgW5 SW1FNQkvHewo1dlyI2EXK79D/dVsvwjso8WAjsOG/Yd+7/oY8urTEG+YUDA7ICV+/8doMzTHE AgAuOwiQXX2feG8NPsh6eggT+6gh+jpxLSyjcYsLopR7ufEVSmal2bDEIMyEBg4BS83gYy6CC DPdgqaH50tKBv3/1baCTpb2HykeINezS4ZYqWX5dvXzAWZ0V6MycMmhIYM0x1wvrfFMrHOrXq ElOJU5Yrb8svoTT5mvJUMnJtycQVDsceMKz58SxDV8ffI/wandxSaMzD+XqEFgudrWxcIaVGQ ObhPA2oIHaOLh+yMQyr/pMZQzviEkqmwm8EndkUR0Oo9VIhwpyf3uNbp9ga8vVmNHWMz5PHWW VAWoweB2zlZltf9fftSzV0GkzxaSop988O87ocL831vjLtldQVygU4coUuzRcGHxd4bGtfUL9 kynei2X776iDkYYBGlyXPgWSpRugKtuB0Tai/2pb+Levf3DLJhMMYFJWAgz3DDJOdki92kr+G C51mjf6dkg+ZfWPeBO2SnsPFF18cbTrTB2tB5J240ooKVC+cf0ftSwpYbD3A9CnAebvUif8p9 +sDMyntXG2NHZ7mZxYJ9mHE6fuxmceJ1WV/K0y4tbdrRlTlIyTu07FPYKgrfDtMojButzHBK5 51NrwUkdMG6OCvh44uma/tR1MvUy6ru/y1CD6IAnICaS0WOqHvKz5Ck/hsXw63pUeWWP7O3cP j6vwAQhqUvKdMOAvmcl3sWcai6yukZpj5NcC/KwNwUW1XNITcfxd1Fm/yFVi9xaaWLqdt8P3k ZzD1krW Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 10/29/2015 10:49 PM, Pavel Machek wrote: > On Sun 2015-10-04 18:30:14, Toralf Förster wrote: >> On 08/04/2015 02:29 PM, Toralf Förster wrote: >>> On 08/02/2015 09:43 AM, Pavel Machek wrote: >>>> Any chance to bisect it? >>> Did it. >>> >>> FWIW: the mentioned commit was introduced between 3.18 and 3.19. >>> But my system (hardened 64 bit Gentoo) did not suffer from it till version 4.0.8. >>> The hardened kernel 4.1.x was the first where the bug was visible at my docked environment too. >>> >>> >>> >>> commit e7d6f7d708290da1b7c92f533444b042c79412e0 >>> Author: Dave Airlie >>> Date: Mon Dec 8 13:23:37 2014 +1000 >>> >>> drm/i915: resume MST after reading back hw state >>> >>> Otherwise the MST resume paths can hit DPMS paths >>> which hit state checker paths, which hit WARN_ON, >>> because the state checker is inconsistent with the >>> hw. >>> >>> This fixes a bunch of WARN_ON's on resume after >>> undocking. >>> >>> Signed-off-by: Dave Airlie >>> Reviewed-by: Daniel Vetter >>> Cc: stable@vger.kernel.org >>> Signed-off-by: Jani Nikula >>> >> >> Is there anything else what I can do ? >> >> Current kernels up to 4.2.3 and 4.3-rc3 (not hardened) shows this issue here at my system. > > Yes. Now you ask Dave Airlie to fix it. If that Dear Dave, please fix it. Here's a work around which works for me since kernel 4.1.x : diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index ab64d68..3aeead2 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -740,6 +740,8 @@ static int i915_drm_resume(struct drm_device *dev) if (dev_priv->display.hpd_irq_setup) dev_priv->display.hpd_irq_setup(dev); spin_unlock_irq(&dev_priv->irq_lock); + + intel_dp_mst_resume(dev); drm_modeset_lock_all(dev); intel_display_resume(dev); > does not work, you ask him to fix it, in less polite words. If that > does not work, you verify that reverting > e7d6f7d708290da1b7c92f533444b042c79412e0 fixes it for you, then ask > Daniel Vetter and Jani Nikula to revert it. If they fail to do that, > you go all the way up to Linus. > > Good luck ;-), > Pavel > -- Toralf, pgp key: C4EACDDE 0076E94E