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: Tue, 4 Aug 2015 14:29:44 +0200 Message-ID: <55C0B038.8090807@gmx.de> References: <55B8DAF8.6070805@gmx.de> <20150802074334.GG3720@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.19]) by gabe.freedesktop.org (Postfix) with ESMTPS id 69F396E1BB for ; Tue, 4 Aug 2015 05:29:52 -0700 (PDT) In-Reply-To: <20150802074334.GG3720@amd> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Pavel Machek Cc: Dave Airlie , intel-gfx , Linux Kernel List-Id: intel-gfx@lists.freedesktop.org T24gMDgvMDIvMjAxNSAwOTo0MyBBTSwgUGF2ZWwgTWFjaGVrIHdyb3RlOgo+IEFueSBjaGFuY2Ug dG8gYmlzZWN0IGl0PwpEaWQgaXQuCgpGV0lXOiB0aGUgbWVudGlvbmVkIGNvbW1pdCB3YXMgaW50 cm9kdWNlZCBiZXR3ZWVuIDMuMTggYW5kIDMuMTkuCkJ1dCBteSBzeXN0ZW0gKGhhcmRlbmVkIDY0 IGJpdCBHZW50b28pIGRpZCBub3Qgc3VmZmVyIGZyb20gaXQgdGlsbCB2ZXJzaW9uIDQuMC44LgpU aGUgaGFyZGVuZWQga2VybmVsIDQuMS54IHdhcyB0aGUgZmlyc3Qgd2hlcmUgdGhlIGJ1ZyB3YXMg dmlzaWJsZSBhdCBteSBkb2NrZWQgZW52aXJvbm1lbnQgIHRvby4KCgoKY29tbWl0IGU3ZDZmN2Q3 MDgyOTBkYTFiN2M5MmY1MzM0NDRiMDQyYzc5NDEyZTAKQXV0aG9yOiBEYXZlIEFpcmxpZSA8YWly bGllZEByZWRoYXQuY29tPgpEYXRlOiAgIE1vbiBEZWMgOCAxMzoyMzozNyAyMDE0ICsxMDAwCgog ICAgZHJtL2k5MTU6IHJlc3VtZSBNU1QgYWZ0ZXIgcmVhZGluZyBiYWNrIGh3IHN0YXRlCgogICAg T3RoZXJ3aXNlIHRoZSBNU1QgcmVzdW1lIHBhdGhzIGNhbiBoaXQgRFBNUyBwYXRocwogICAgd2hp Y2ggaGl0IHN0YXRlIGNoZWNrZXIgcGF0aHMsIHdoaWNoIGhpdCBXQVJOX09OLAogICAgYmVjYXVz ZSB0aGUgc3RhdGUgY2hlY2tlciBpcyBpbmNvbnNpc3RlbnQgd2l0aCB0aGUKICAgIGh3LgoKICAg IFRoaXMgZml4ZXMgYSBidW5jaCBvZiBXQVJOX09OJ3Mgb24gcmVzdW1lIGFmdGVyCiAgICB1bmRv Y2tpbmcuCgogICAgU2lnbmVkLW9mZi1ieTogRGF2ZSBBaXJsaWUgPGFpcmxpZWRAcmVkaGF0LmNv bT4KICAgIFJldmlld2VkLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNo PgogICAgQ2M6IHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmcKICAgIFNpZ25lZC1vZmYtYnk6IEphbmkg TmlrdWxhIDxqYW5pLm5pa3VsYUBpbnRlbC5jb20+CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKaW5k ZXggMWU5YzEzNi4uZjk5MGFiNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kcnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCkBAIC03MDYsMTEg KzcwNiwxMiBAQCBzdGF0aWMgaW50IGk5MTVfZHJtX3Jlc3VtZShzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KQogICAgICAgICAgICAgICAgICAgICAgICBkZXZfcHJpdi0+ZGlzcGxheS5ocGRfaXJxX3Nl dHVwKGRldik7CiAgICAgICAgICAgICAgICBzcGluX3VubG9ja19pcnEoJmRldl9wcml2LT5pcnFf bG9jayk7CgotICAgICAgICAgICAgICAgaW50ZWxfZHBfbXN0X3Jlc3VtZShkZXYpOwogICAgICAg ICAgICAgICAgZHJtX21vZGVzZXRfbG9ja19hbGwoZGV2KTsKICAgICAgICAgICAgICAgIGludGVs X21vZGVzZXRfc2V0dXBfaHdfc3RhdGUoZGV2LCB0cnVlKTsKICAgICAgICAgICAgICAgIGRybV9t b2Rlc2V0X3VubG9ja19hbGwoZGV2KTsKCisgICAgICAgICAgICAgICBpbnRlbF9kcF9tc3RfcmVz dW1lKGRldik7CisKICAgICAgICAgICAgICAgIC8qCiAgICAgICAgICAgICAgICAgKiAuLi4gYnV0 IGFsc28gbmVlZCB0byBtYWtlIHN1cmUgdGhhdCBob3RwbHVnIHByb2Nlc3NpbmcKICAgICAgICAg ICAgICAgICAqIGRvZXNuJ3QgY2F1c2UgaGF2b2MuIExpa2UgaW4gdGhlIGRyaXZlciBsb2FkIGNv ZGUgd2UgZG9uJ3QKCgotLSAKVG9yYWxmLCBwZ3Aga2V5OiA4NzJBRTUwOCAwMDc2RTk0RQpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756479AbbHDMaW (ORCPT ); Tue, 4 Aug 2015 08:30:22 -0400 Received: from mout.gmx.net ([212.227.15.19]:61731 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755854AbbHDMaT (ORCPT ); Tue, 4 Aug 2015 08:30:19 -0400 Subject: Re: 4.0.8->4.1.3 : after resume from s2ram both internal and external display of a docked ThinkPad ate black To: Pavel Machek References: <55B8DAF8.6070805@gmx.de> <20150802074334.GG3720@amd> Cc: intel-gfx , Linux Kernel , Dave Airlie From: =?UTF-8?Q?Toralf_F=c3=b6rster?= Message-ID: <55C0B038.8090807@gmx.de> Date: Tue, 4 Aug 2015 14:29:44 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.1.0 MIME-Version: 1.0 In-Reply-To: <20150802074334.GG3720@amd> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:WLSjK/hf7l8nC/SqrSiYLJDIUP+r+4R115cIBf6EKnhwbJFPzHO B2KRCoXWRTzENc2ntJdCukpmWS5JHp6Qlrkql9jHTPqTRGwjUCMihkemKr063KmUl5N6J+C nPdgUyw/O5iELlXIjqHrPAW6ISMJ/GWLUjD9Z7JstJPhXCUJftHoA2t7mAShyoEYhgyYMwR oa0tlhX0gRcXNuXp7weXA== X-UI-Out-Filterresults: notjunk:1;V01:K0:sUysRvLZzXM=:wVmQhmDcSYBE7io6bsMzVv C6Y61+ribmr2f1Kdcp/SHK0BXgHCrKWEYQp63S7iDL+ZZi244IZHA4KOk2u1OG62UlYYu6C5l R5aOLNxgBDG8UkHe0eKOqm2y10R7GINlfV4V2CISgM1buodN8CQia9uMrA3LHP0jBSwlKhONS NkG9zqxQx5L9fwlwCFOSnAFMTwnARo/Of+bGAgtcI0ENRXworMqVDSrl/nMtidjZe0QP+xYcn Qt/bcChKOWfqo5T9xSzCQOAC5EgOOXoqzREzo4w2XDRhLznoCEigc1ZrqKc2hSktT0Lg9cG/t lH+MSZmCcvzEBbr5LFhkVyno/KSp2s272kVfhTNxKdXv09ORjKA9O4gUhiexZYIS9/2GsML0a LXjGYPnh59kFhSdD07y2XQmQ5Kl1+eN+K7TzkQN7dag+CHM5Q5cnMx6ngWfLm3kbPSHCPUx9D v+AlSCXA3zAinchRr7DuV5J28OdX7nkYSPsVM5EMLS0VxVPtSx8Zz/Rk1au5DxMC/ng/sGIRc 5z64Dt7U6QxEhjU3kIejwjxGEK6YjrAE1JkH5JeJ47lZYawx9DiSk7Ohm7OXDzzCQQVZ7rZ0B LReeamRrJpZSYO/3ZsBq0QYwqttgSZRLM/IBUNzPT4QsVIHhdxpvthZh4WTBQHGb3uvre399y gir2aJS84abhFlHg6Lcsx6xIPHQP0qVijUJeBoA/MNdGnOf1ocM2HmaSBGwyogq3xOEU= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 1e9c136..f990ab4 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -706,11 +706,12 @@ static int i915_drm_resume(struct drm_device *dev) 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_modeset_setup_hw_state(dev, true); drm_modeset_unlock_all(dev); + intel_dp_mst_resume(dev); + /* * ... but also need to make sure that hotplug processing * doesn't cause havoc. Like in the driver load code we don't -- Toralf, pgp key: 872AE508 0076E94E