From patchwork Fri Oct 30 09:38:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Toralf_F=C3=B6rster?= X-Patchwork-Id: 7525791 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1BA4E9F327 for ; Fri, 30 Oct 2015 09:38:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1F91020872 for ; Fri, 30 Oct 2015 09:38:32 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id D3BB72084B for ; Fri, 30 Oct 2015 09:38:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C165F88867; Fri, 30 Oct 2015 02:38:28 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org 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) Received: from [192.168.178.24] ([78.54.50.171]) by mail.gmx.com (mrgmx002) with ESMTPSA (Nemesis) id 0MBWo2-1ZjogC1wU2-00AVG8; Fri, 30 Oct 2015 10:38:22 +0100 References: <55B8DAF8.6070805@gmx.de> <20150802074334.GG3720@amd> <55C0B038.8090807@gmx.de> <56115416.7040404@gmx.de> <20151029214933.GA18861@amd> 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> 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 Cc: intel-gfx , Linux Kernel , Pavel Machek Subject: Re: [Intel-gfx] 4.0.8->4.1.3 : after resume from s2ram both internal and external display of a docked ThinkPad ate black X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-5.2 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 : > 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 > 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);