From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [Intel-gfx] [PATCH] drm/i915: fix deadlock on lid open Date: Wed, 30 Mar 2016 11:54:34 +0200 Message-ID: <20160330095434.GD2510@phenom.ffwll.local> References: <1459328913-13719-1-git-send-email-bjorn@mork.no> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x230.google.com (mail-wm0-x230.google.com [IPv6:2a00:1450:400c:c09::230]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8CB356E773 for ; Wed, 30 Mar 2016 09:54:32 +0000 (UTC) Received: by mail-wm0-x230.google.com with SMTP id r72so91618144wmg.0 for ; Wed, 30 Mar 2016 02:54:32 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1459328913-13719-1-git-send-email-bjorn@mork.no> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: =?iso-8859-1?Q?Bj=F8rn?= Mork Cc: Daniel Vetter , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org T24gV2VkLCBNYXIgMzAsIDIwMTYgYXQgMTE6MDg6MzNBTSArMDIwMCwgQmrDuHJuIE1vcmsgd3Jv dGU6Cj4gY29tbWl0IGUyYzhiODcwMWUyZCBtb3ZlZCBtb2Rlc2V0IGxvY2tpbmcgaW5zaWRlIHJl c3VtZS9zdXNwZW5kCj4gZnVuY3Rpb25zLCBidXQgbWlzc2VkIGEgY29kZSBwYXRoIG9ubHkgZXhl Y3V0ZWQgb24gbGlkIGNsb3NlL29wZW4KPiBvbiBvbGRlciBoYXJkd2FyZS4gVGhlIHJlc3VsdCB3 YXMgYSBkZWFkbG9jayB3aGVuIGNsb3NpbmcgYW5kCj4gb3BlbmluZyB0aGUgbGlkIHdpdGhvdXQg c3VzcGVuZGluZyBvbiBzdWNoIGhhcmR3YXJlOgo+IAo+ICA9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KPiAgWyBJTkZPOiBwb3NzaWJsZSByZWN1cnNpdmUgbG9j a2luZyBkZXRlY3RlZCBdCj4gIDQuNi4wLXJjMSAjMzg1IE5vdCB0YWludGVkCj4gIC0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQo+ICBrd29ya2VyLzA6My84OCBp cyB0cnlpbmcgdG8gYWNxdWlyZSBsb2NrOgo+ICAgKCZkZXYtPm1vZGVfY29uZmlnLm11dGV4KXsr LisuKy59LCBhdDogWzxmZmZmZmZmZmEwNjNlNmE0Pl0gaW50ZWxfZGlzcGxheV9yZXN1bWUrMHg0 YS8weDEyZiBbaTkxNV0KPiAKPiAgYnV0IHRhc2sgaXMgYWxyZWFkeSBob2xkaW5nIGxvY2s6Cj4g ICAoJmRldi0+bW9kZV9jb25maWcubXV0ZXgpeysuKy4rLn0sIGF0OiBbPGZmZmZmZmZmYTAyZDBk NGY+XSBkcm1fbW9kZXNldF9sb2NrX2FsbCsweDNlLzB4YTYgW2RybV0KPiAKPiAgb3RoZXIgaW5m byB0aGF0IG1pZ2h0IGhlbHAgdXMgZGVidWcgdGhpczoKPiAgIFBvc3NpYmxlIHVuc2FmZSBsb2Nr aW5nIHNjZW5hcmlvOgo+IAo+ICAgICAgICAgQ1BVMAo+ICAgICAgICAgLS0tLQo+ICAgIGxvY2so JmRldi0+bW9kZV9jb25maWcubXV0ZXgpOwo+ICAgIGxvY2soJmRldi0+bW9kZV9jb25maWcubXV0 ZXgpOwo+IAo+ICAgKioqIERFQURMT0NLICoqKgo+IAo+ICAgTWF5IGJlIGR1ZSB0byBtaXNzaW5n IGxvY2sgbmVzdGluZyBub3RhdGlvbgo+IAo+ICA3IGxvY2tzIGhlbGQgYnkga3dvcmtlci8wOjMv ODg6Cj4gICAjMDogICgia2FjcGlfbm90aWZ5Iil7KysrKy4rfSwgYXQ6IFs8ZmZmZmZmZmY4MTA2 OGRmYz5dIHByb2Nlc3Nfb25lX3dvcmsrMHgxNGEvMHg1MGIKPiAgICMxOiAgKCgmZHBjLT53b3Jr KSMyKXsrLisuKy59LCBhdDogWzxmZmZmZmZmZjgxMDY4ZGZjPl0gcHJvY2Vzc19vbmVfd29yaysw eDE0YS8weDUwYgo+ICAgIzI6ICAoKGFjcGlfbGlkX25vdGlmaWVyKS5yd3NlbSl7KysrKy4rfSwg YXQ6IFs8ZmZmZmZmZmY4MTA2Zjg3ND5dIF9fYmxvY2tpbmdfbm90aWZpZXJfY2FsbF9jaGFpbisw eDM0LzB4NjUKPiAgICMzOiAgKCZkZXZfcHJpdi0+bW9kZXNldF9yZXN0b3JlX2xvY2speysuKy4r Ln0sIGF0OiBbPGZmZmZmZmZmYTA2NjRjZjY+XSBpbnRlbF9saWRfbm90aWZ5KzB4M2MvMHhkOSBb aTkxNV0KPiAgICM0OiAgKCZkZXYtPm1vZGVfY29uZmlnLm11dGV4KXsrLisuKy59LCBhdDogWzxm ZmZmZmZmZmEwMmQwZDRmPl0gZHJtX21vZGVzZXRfbG9ja19hbGwrMHgzZS8weGE2IFtkcm1dCj4g ICAjNTogIChjcnRjX3d3X2NsYXNzX2FjcXVpcmUpeysuKy4rLn0sIGF0OiBbPGZmZmZmZmZmYTAy ZDBkNTk+XSBkcm1fbW9kZXNldF9sb2NrX2FsbCsweDQ4LzB4YTYgW2RybV0KPiAgICM2OiAgKGNy dGNfd3dfY2xhc3NfbXV0ZXgpeysuKy4rLn0sIGF0OiBbPGZmZmZmZmZmYTAyZDBiMmE+XSBtb2Rl c2V0X2xvY2srMHgxM2MvMHgxY2QgW2RybV0KPiAKPiAgc3RhY2sgYmFja3RyYWNlOgo+ICBDUFU6 IDAgUElEOiA4OCBDb21tOiBrd29ya2VyLzA6MyBOb3QgdGFpbnRlZCA0LjYuMC1yYzEgIzM4NQo+ ICBIYXJkd2FyZSBuYW1lOiBMRU5PVk8gMjc3NkxFRy8yNzc2TEVHLCBCSU9TIDZFRVQ1NVdXICgz LjE1ICkgMTIvMTkvMjAxMQo+ICBXb3JrcXVldWU6IGthY3BpX25vdGlmeSBhY3BpX29zX2V4ZWN1 dGVfZGVmZXJyZWQKPiAgIDAwMDAwMDAwMDAwMDAwMDAgZmZmZjg4MDIyZmQ1Zjk5MCBmZmZmZmZm ZjgxMjRhZjA2IGZmZmZmZmZmODI1YjM5YzAKPiAgIGZmZmZmZmZmODI1YjM5YzAgZmZmZjg4MDIy ZmQ1ZmE2MCBmZmZmZmZmZjgxMDhmNTQ3IGZmZmY4ODAyMmZkNWZhNzAKPiAgIDAwMDAwMDAwODEw OGU4MTcgZmZmZjg4MDIzMDIzNmNjMCAwMDAwMDAwMDAwMDAwMDAwIGZmZmZmZmZmODI1YjM5YzAK PiAgQ2FsbCBUcmFjZToKPiAgIFs8ZmZmZmZmZmY4MTI0YWYwNj5dIGR1bXBfc3RhY2srMHg2Ny8w eDkwCj4gICBbPGZmZmZmZmZmODEwOGY1NDc+XSBfX2xvY2tfYWNxdWlyZSsweGRiNS8weGY3MQo+ ICAgWzxmZmZmZmZmZjgxMDhiZDJjPl0gPyBsb29rX3VwX2xvY2tfY2xhc3MrMHhiZS8weDEwYQo+ ICAgWzxmZmZmZmZmZjgxMDhmYWUyPl0gbG9ja19hY3F1aXJlKzB4MTM3LzB4MWNiCj4gICBbPGZm ZmZmZmZmODEwOGZhZTI+XSA/IGxvY2tfYWNxdWlyZSsweDEzNy8weDFjYgo+ICAgWzxmZmZmZmZm ZmEwNjNlNmE0Pl0gPyBpbnRlbF9kaXNwbGF5X3Jlc3VtZSsweDRhLzB4MTJmIFtpOTE1XQo+ICAg WzxmZmZmZmZmZjgxNDgyMDJmPl0gbXV0ZXhfbG9ja19uZXN0ZWQrMHg3ZS8weDNhNAo+ICAgWzxm ZmZmZmZmZmEwNjNlNmE0Pl0gPyBpbnRlbF9kaXNwbGF5X3Jlc3VtZSsweDRhLzB4MTJmIFtpOTE1 XQo+ICAgWzxmZmZmZmZmZmEwNjNlNmE0Pl0gPyBpbnRlbF9kaXNwbGF5X3Jlc3VtZSsweDRhLzB4 MTJmIFtpOTE1XQo+ICAgWzxmZmZmZmZmZmEwMmQwYjJhPl0gPyBtb2Rlc2V0X2xvY2srMHgxM2Mv MHgxY2QgW2RybV0KPiAgIFs8ZmZmZmZmZmZhMDYzZTZhND5dIGludGVsX2Rpc3BsYXlfcmVzdW1l KzB4NGEvMHgxMmYgW2k5MTVdCj4gICBbPGZmZmZmZmZmYTA2M2U2YTQ+XSA/IGludGVsX2Rpc3Bs YXlfcmVzdW1lKzB4NGEvMHgxMmYgW2k5MTVdCj4gICBbPGZmZmZmZmZmYTAyZDBiMmE+XSA/IG1v ZGVzZXRfbG9jaysweDEzYy8weDFjZCBbZHJtXQo+ICAgWzxmZmZmZmZmZmEwMmQwYjJhPl0gPyBt b2Rlc2V0X2xvY2srMHgxM2MvMHgxY2QgW2RybV0KPiAgIFs8ZmZmZmZmZmZhMDJkMGJmNz5dID8g ZHJtX21vZGVzZXRfbG9jaysweDE3LzB4MjQgW2RybV0KPiAgIFs8ZmZmZmZmZmZhMDJkMGM4Yj5d ID8gZHJtX21vZGVzZXRfbG9ja19hbGxfY3R4KzB4ODcvMHhhMSBbZHJtXQo+ICAgWzxmZmZmZmZm ZmEwNjY0ZDZhPl0gaW50ZWxfbGlkX25vdGlmeSsweGIwLzB4ZDkgW2k5MTVdCj4gICBbPGZmZmZm ZmZmODEwNmY0YzY+XSBub3RpZmllcl9jYWxsX2NoYWluKzB4NGEvMHg2Ywo+ICAgWzxmZmZmZmZm ZjgxMDZmODhkPl0gX19ibG9ja2luZ19ub3RpZmllcl9jYWxsX2NoYWluKzB4NGQvMHg2NQo+ICAg WzxmZmZmZmZmZjgxMDZmOGI5Pl0gYmxvY2tpbmdfbm90aWZpZXJfY2FsbF9jaGFpbisweDE0LzB4 MTYKPiAgIFs8ZmZmZmZmZmZhMDAxMTIxNT5dIGFjcGlfbGlkX3NlbmRfc3RhdGUrMHg4My8weGFk IFtidXR0b25dCj4gICBbPGZmZmZmZmZmYTAwMTEyYTY+XSBhY3BpX2J1dHRvbl9ub3RpZnkrMHg0 MS8weDEzMiBbYnV0dG9uXQo+ICAgWzxmZmZmZmZmZjgxMmIwN2RmPl0gYWNwaV9kZXZpY2Vfbm90 aWZ5KzB4MTkvMHgxYgo+ICAgWzxmZmZmZmZmZjgxMmM4NTcwPl0gYWNwaV9ldl9ub3RpZnlfZGlz cGF0Y2grMHg0OS8weDY0Cj4gICBbPGZmZmZmZmZmODEyYWI5ZmI+XSBhY3BpX29zX2V4ZWN1dGVf ZGVmZXJyZWQrMHgxNC8weDIwCj4gICBbPGZmZmZmZmZmODEwNjhmMTc+XSBwcm9jZXNzX29uZV93 b3JrKzB4MjY1LzB4NTBiCj4gICBbPGZmZmZmZmZmODEwNjk2ZjU+XSB3b3JrZXJfdGhyZWFkKzB4 MWZjLzB4MmRkCj4gICBbPGZmZmZmZmZmODEwNjk0Zjk+XSA/IHJlc2N1ZXJfdGhyZWFkKzB4MzA5 LzB4MzA5Cj4gICBbPGZmZmZmZmZmODEwNjk0Zjk+XSA/IHJlc2N1ZXJfdGhyZWFkKzB4MzA5LzB4 MzA5Cj4gICBbPGZmZmZmZmZmODEwNmUyZDY+XSBrdGhyZWFkKzB4ZTAvMHhlOAo+ICAgWzxmZmZm ZmZmZjgxMDdiYzQ3Pl0gPyBsb2NhbF9jbG9jaysweDE5LzB4MjIKPiAgIFs8ZmZmZmZmZmY4MTQ4 NGY0Mj5dIHJldF9mcm9tX2ZvcmsrMHgyMi8weDQwCj4gICBbPGZmZmZmZmZmODEwNmUxZjY+XSA/ IGt0aHJlYWRfY3JlYXRlX29uX25vZGUrMHgxYjUvMHgxYjUKPiAKPiBGaXhlczogZTJjOGI4NzAx ZTJkICgiZHJtL2k5MTU6IFVzZSBhdG9taWMgaGVscGVycyBmb3Igc3VzcGVuZCwgdjIuIikKPiBD YzogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4K PiBTaWduZWQtb2ZmLWJ5OiBCasO4cm4gTW9yayA8Ympvcm5AbW9yay5ubz4KCk9vcHMsIHRoYXQg b25lJ3MgcHJldHR5IHNpbGx5LiBVbmZvcnR1bmF0ZWx5IHdlIGRvbid0IGhhdmUgYW55IHN1Y2gK bWFjaGluZXMgaW4gQ0kgeWV0LCBhbmQgaXQgd291bGRuJ3QgYmUgcG9zc2libGUgdG8gZXhlcmNp c2UgdGhlIGxpZApub3RpZmllciBhdXRvbWF0aWNhbGx5LgoKVGhhbmtzIGZvciB5b3VyIGZpeCwg YXBwbGllZC4KLURhbmllbAoKPiAtLS0KPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHZk cy5jIHwgNSArLS0tLQo+ICAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDQgZGVsZXRp b25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2x2ZHMu YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2x2ZHMuYwo+IGluZGV4IDMwYTg0MDNhOGY0 Zi4uY2Q5ZmU2MDlhZWZiIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2x2ZHMuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2x2ZHMuYwo+IEBAIC00 NzgsMTEgKzQ3OCw4IEBAIHN0YXRpYyBpbnQgaW50ZWxfbGlkX25vdGlmeShzdHJ1Y3Qgbm90aWZp ZXJfYmxvY2sgKm5iLCB1bnNpZ25lZCBsb25nIHZhbCwKPiAgCSAqIGFuZCBhcyBwYXJ0IG9mIHRo ZSBjbGVhbnVwIGluIHRoZSBodyBzdGF0ZSByZXN0b3JlIHdlIGFsc28gcmVkaXNhYmxlCj4gIAkg KiB0aGUgdmdhIHBsYW5lLgo+ICAJICovCj4gLQlpZiAoIUhBU19QQ0hfU1BMSVQoZGV2KSkgewo+ IC0JCWRybV9tb2Rlc2V0X2xvY2tfYWxsKGRldik7Cj4gKwlpZiAoIUhBU19QQ0hfU1BMSVQoZGV2 KSkKPiAgCQlpbnRlbF9kaXNwbGF5X3Jlc3VtZShkZXYpOwo+IC0JCWRybV9tb2Rlc2V0X3VubG9j a19hbGwoZGV2KTsKPiAtCX0KPiAgCj4gIAlkZXZfcHJpdi0+bW9kZXNldF9yZXN0b3JlID0gTU9E RVNFVF9ET05FOwo+ICAKPiAtLSAKPiAyLjEuNAo+IAo+IF9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCj4gSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdAo+IEludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKPiBodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAoKLS0gCkRhbmllbCBWZXR0ZXIKU29mdHdhcmUg RW5naW5lZXIsIEludGVsIENvcnBvcmF0aW9uCmh0dHA6Ly9ibG9nLmZmd2xsLmNoCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5n IGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752135AbcC3Jyf (ORCPT ); Wed, 30 Mar 2016 05:54:35 -0400 Received: from mail-wm0-f51.google.com ([74.125.82.51]:35320 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752419AbcC3Jyc (ORCPT ); Wed, 30 Mar 2016 05:54:32 -0400 Date: Wed, 30 Mar 2016 11:54:34 +0200 From: Daniel Vetter To: =?iso-8859-1?Q?Bj=F8rn?= Mork Cc: Daniel Vetter , David Airlie , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: Re: [Intel-gfx] [PATCH] drm/i915: fix deadlock on lid open Message-ID: <20160330095434.GD2510@phenom.ffwll.local> Mail-Followup-To: =?iso-8859-1?Q?Bj=F8rn?= Mork , Daniel Vetter , David Airlie , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org References: <1459328913-13719-1-git-send-email-bjorn@mork.no> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1459328913-13719-1-git-send-email-bjorn@mork.no> X-Operating-System: Linux phenom 4.4.0-1-amd64 User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Mar 30, 2016 at 11:08:33AM +0200, Bjørn Mork wrote: > commit e2c8b8701e2d moved modeset locking inside resume/suspend > functions, but missed a code path only executed on lid close/open > on older hardware. The result was a deadlock when closing and > opening the lid without suspending on such hardware: > > ============================================= > [ INFO: possible recursive locking detected ] > 4.6.0-rc1 #385 Not tainted > --------------------------------------------- > kworker/0:3/88 is trying to acquire lock: > (&dev->mode_config.mutex){+.+.+.}, at: [] intel_display_resume+0x4a/0x12f [i915] > > but task is already holding lock: > (&dev->mode_config.mutex){+.+.+.}, at: [] drm_modeset_lock_all+0x3e/0xa6 [drm] > > other info that might help us debug this: > Possible unsafe locking scenario: > > CPU0 > ---- > lock(&dev->mode_config.mutex); > lock(&dev->mode_config.mutex); > > *** DEADLOCK *** > > May be due to missing lock nesting notation > > 7 locks held by kworker/0:3/88: > #0: ("kacpi_notify"){++++.+}, at: [] process_one_work+0x14a/0x50b > #1: ((&dpc->work)#2){+.+.+.}, at: [] process_one_work+0x14a/0x50b > #2: ((acpi_lid_notifier).rwsem){++++.+}, at: [] __blocking_notifier_call_chain+0x34/0x65 > #3: (&dev_priv->modeset_restore_lock){+.+.+.}, at: [] intel_lid_notify+0x3c/0xd9 [i915] > #4: (&dev->mode_config.mutex){+.+.+.}, at: [] drm_modeset_lock_all+0x3e/0xa6 [drm] > #5: (crtc_ww_class_acquire){+.+.+.}, at: [] drm_modeset_lock_all+0x48/0xa6 [drm] > #6: (crtc_ww_class_mutex){+.+.+.}, at: [] modeset_lock+0x13c/0x1cd [drm] > > stack backtrace: > CPU: 0 PID: 88 Comm: kworker/0:3 Not tainted 4.6.0-rc1 #385 > Hardware name: LENOVO 2776LEG/2776LEG, BIOS 6EET55WW (3.15 ) 12/19/2011 > Workqueue: kacpi_notify acpi_os_execute_deferred > 0000000000000000 ffff88022fd5f990 ffffffff8124af06 ffffffff825b39c0 > ffffffff825b39c0 ffff88022fd5fa60 ffffffff8108f547 ffff88022fd5fa70 > 000000008108e817 ffff880230236cc0 0000000000000000 ffffffff825b39c0 > Call Trace: > [] dump_stack+0x67/0x90 > [] __lock_acquire+0xdb5/0xf71 > [] ? look_up_lock_class+0xbe/0x10a > [] lock_acquire+0x137/0x1cb > [] ? lock_acquire+0x137/0x1cb > [] ? intel_display_resume+0x4a/0x12f [i915] > [] mutex_lock_nested+0x7e/0x3a4 > [] ? intel_display_resume+0x4a/0x12f [i915] > [] ? intel_display_resume+0x4a/0x12f [i915] > [] ? modeset_lock+0x13c/0x1cd [drm] > [] intel_display_resume+0x4a/0x12f [i915] > [] ? intel_display_resume+0x4a/0x12f [i915] > [] ? modeset_lock+0x13c/0x1cd [drm] > [] ? modeset_lock+0x13c/0x1cd [drm] > [] ? drm_modeset_lock+0x17/0x24 [drm] > [] ? drm_modeset_lock_all_ctx+0x87/0xa1 [drm] > [] intel_lid_notify+0xb0/0xd9 [i915] > [] notifier_call_chain+0x4a/0x6c > [] __blocking_notifier_call_chain+0x4d/0x65 > [] blocking_notifier_call_chain+0x14/0x16 > [] acpi_lid_send_state+0x83/0xad [button] > [] acpi_button_notify+0x41/0x132 [button] > [] acpi_device_notify+0x19/0x1b > [] acpi_ev_notify_dispatch+0x49/0x64 > [] acpi_os_execute_deferred+0x14/0x20 > [] process_one_work+0x265/0x50b > [] worker_thread+0x1fc/0x2dd > [] ? rescuer_thread+0x309/0x309 > [] ? rescuer_thread+0x309/0x309 > [] kthread+0xe0/0xe8 > [] ? local_clock+0x19/0x22 > [] ret_from_fork+0x22/0x40 > [] ? kthread_create_on_node+0x1b5/0x1b5 > > Fixes: e2c8b8701e2d ("drm/i915: Use atomic helpers for suspend, v2.") > Cc: Maarten Lankhorst > Signed-off-by: Bjørn Mork Oops, that one's pretty silly. Unfortunately we don't have any such machines in CI yet, and it wouldn't be possible to exercise the lid notifier automatically. Thanks for your fix, applied. -Daniel > --- > drivers/gpu/drm/i915/intel_lvds.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c > index 30a8403a8f4f..cd9fe609aefb 100644 > --- a/drivers/gpu/drm/i915/intel_lvds.c > +++ b/drivers/gpu/drm/i915/intel_lvds.c > @@ -478,11 +478,8 @@ static int intel_lid_notify(struct notifier_block *nb, unsigned long val, > * and as part of the cleanup in the hw state restore we also redisable > * the vga plane. > */ > - if (!HAS_PCH_SPLIT(dev)) { > - drm_modeset_lock_all(dev); > + if (!HAS_PCH_SPLIT(dev)) > intel_display_resume(dev); > - drm_modeset_unlock_all(dev); > - } > > dev_priv->modeset_restore = MODESET_DONE; > > -- > 2.1.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch