From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pavel Machek Subject: 4.0 -> 4.1 regression : after resume from s2ram both internal and external display of a docked ThinkPad ate black Date: Thu, 3 Dec 2015 17:06:59 +0100 Message-ID: <20151203160659.GB31751@amd> References: <55B8DAF8.6070805@gmx.de> <20150802074334.GG3720@amd> <55C0B038.8090807@gmx.de> <56115416.7040404@gmx.de> <20151029214933.GA18861@amd> <56333A8A.3000707@gmx.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from atrey.karlin.mff.cuni.cz (atrey.karlin.mff.cuni.cz [195.113.26.193]) by gabe.freedesktop.org (Postfix) with ESMTP id 862D28A448 for ; Thu, 3 Dec 2015 08:07:03 -0800 (PST) Content-Disposition: inline In-Reply-To: <56333A8A.3000707@gmx.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Toralf =?iso-8859-1?Q?F=F6rster?= Cc: Dave Airlie , intel-gfx , Linux Kernel , daniel.vetter@intel.com List-Id: intel-gfx@lists.freedesktop.org PiA+Pj4gY29tbWl0IGU3ZDZmN2Q3MDgyOTBkYTFiN2M5MmY1MzM0NDRiMDQyYzc5NDEyZTAKPiA+ Pj4gQXV0aG9yOiBEYXZlIEFpcmxpZSA8YWlybGllZEByZWRoYXQuY29tPgo+ID4+PiBEYXRlOiAg IE1vbiBEZWMgOCAxMzoyMzozNyAyMDE0ICsxMDAwCj4gPj4+Cj4gPj4+ICAgICBkcm0vaTkxNTog cmVzdW1lIE1TVCBhZnRlciByZWFkaW5nIGJhY2sgaHcgc3RhdGUKLi4uLgo+ID4+IElzIHRoZXJl IGFueXRoaW5nIGVsc2Ugd2hhdCBJIGNhbiBkbyA/Cj4gPj4KPiA+PiBDdXJyZW50IGtlcm5lbHMg dXAgdG8gNC4yLjMgYW5kIDQuMy1yYzMgKG5vdCBoYXJkZW5lZCkgc2hvd3MgdGhpcyBpc3N1ZSBo ZXJlIGF0IG15IHN5c3RlbS4KPiA+IAo+ID4gWWVzLiBOb3cgeW91IGFzayBEYXZlIEFpcmxpZSA8 YWlybGllZEByZWRoYXQuY29tPiB0byBmaXggaXQuIElmIHRoYXQKPiAKPiBEZWFyIERhdmUsCj4g Cj4gcGxlYXNlIGZpeCBpdC4KPiAKPiBIZXJlJ3MgYSB3b3JrIGFyb3VuZCB3aGljaCB3b3JrcyBm b3IgbWUgc2luY2Uga2VybmVsIDQuMS54IDoKCkRhdmUuIFlvdSBicm9rZSBpdC4gWW91IGZpeCBp dC4gRG9uJ3QgbWFrZSBtZSBsZXNzIHBvbGl0ZT8KCkRhbmllbD8gSmFuaT8gQ2FuIHlvdSBhcHBs eSB0aGUgcGF0Y2ggYmVsb3csIG9yIGNvbW1lbnQgd2hhdHMgd3JvbmcKd2l0aCB0aGF0PwoKVGhp cyBpcyBhIHJlZ3Jlc3Npb24sIHNvIGl0IHNob3VsZCBub3QgcmVxdWlyZSBtdWNoIHRoaW5raW5n LgoKCQkJCQkJCQkJUGF2ZWwKCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmMKPiBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKPiBpbmRleCBhYjY0 ZDY4Li4zYWVlYWQyIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2 LmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCj4gQEAgLTc0MCw2ICs3 NDAsOCBAQCBzdGF0aWMgaW50IGk5MTVfZHJtX3Jlc3VtZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KQo+ICAgICAgICAgaWYgKGRldl9wcml2LT5kaXNwbGF5LmhwZF9pcnFfc2V0dXApCj4gICAgICAg ICAgICAgICAgIGRldl9wcml2LT5kaXNwbGF5LmhwZF9pcnFfc2V0dXAoZGV2KTsKPiAgICAgICAg IHNwaW5fdW5sb2NrX2lycSgmZGV2X3ByaXYtPmlycV9sb2NrKTsKPiArCj4gKyAgICAgICBpbnRl bF9kcF9tc3RfcmVzdW1lKGRldik7Cj4gCj4gICAgICAgICBkcm1fbW9kZXNldF9sb2NrX2FsbChk ZXYpOwo+ICAgICAgICAgaW50ZWxfZGlzcGxheV9yZXN1bWUoZGV2KTsKPiAKPiAKPiA+IGRvZXMg bm90IHdvcmssIHlvdSBhc2sgaGltIHRvIGZpeCBpdCwgaW4gbGVzcyBwb2xpdGUgd29yZHMuIElm IHRoYXQKPiA+IGRvZXMgbm90IHdvcmssIHlvdSB2ZXJpZnkgdGhhdCByZXZlcnRpbmcKPiA+IGU3 ZDZmN2Q3MDgyOTBkYTFiN2M5MmY1MzM0NDRiMDQyYzc5NDEyZTAgZml4ZXMgaXQgZm9yIHlvdSwg dGhlbiBhc2sKPiA+IERhbmllbCBWZXR0ZXIgYW5kIEphbmkgTmlrdWxhIHRvIHJldmVydCBpdC4g SWYgdGhleSBmYWlsIHRvIGRvIHRoYXQsCj4gPiB5b3UgZ28gYWxsIHRoZSB3YXkgdXAgdG8gTGlu dXMuCj4gPiAKPiA+IEdvb2QgbHVjayA7LSksIAo+ID4gCQkJCQkJCQkJUGF2ZWwKPiA+IAo+IAo+ IAoKLS0gCihlbmdsaXNoKSBodHRwOi8vd3d3LmxpdmVqb3VybmFsLmNvbS9+cGF2ZWxtYWNoZWsK KGNlc2t5LCBwaWN0dXJlcykgaHR0cDovL2F0cmV5Lmthcmxpbi5tZmYuY3VuaS5jei9+cGF2ZWwv cGljdHVyZS9ob3JzZXMvYmxvZy5odG1sCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vaW50ZWwtZ2Z4Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760268AbbLCQHE (ORCPT ); Thu, 3 Dec 2015 11:07:04 -0500 Received: from atrey.karlin.mff.cuni.cz ([195.113.26.193]:54696 "EHLO atrey.karlin.mff.cuni.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752294AbbLCQHC (ORCPT ); Thu, 3 Dec 2015 11:07:02 -0500 Date: Thu, 3 Dec 2015 17:06:59 +0100 From: Pavel Machek To: Toralf =?iso-8859-1?Q?F=F6rster?= Cc: Dave Airlie , intel-gfx , Linux Kernel , daniel.vetter@intel.com, jani.nikula@linux.intel.com Subject: 4.0 -> 4.1 regression : after resume from s2ram both internal and external display of a docked ThinkPad ate black Message-ID: <20151203160659.GB31751@amd> References: <55B8DAF8.6070805@gmx.de> <20150802074334.GG3720@amd> <55C0B038.8090807@gmx.de> <56115416.7040404@gmx.de> <20151029214933.GA18861@amd> <56333A8A.3000707@gmx.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <56333A8A.3000707@gmx.de> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > >>> commit e7d6f7d708290da1b7c92f533444b042c79412e0 > >>> Author: Dave Airlie > >>> Date: Mon Dec 8 13:23:37 2014 +1000 > >>> > >>> drm/i915: resume MST after reading back hw state .... > >> 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 : Dave. You broke it. You fix it. Don't make me less polite? Daniel? Jani? Can you apply the patch below, or comment whats wrong with that? This is a regression, so it should not require much thinking. Pavel > 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 > > > > -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html