From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH v2] drm/i915: gen4: work around hang during hibernation Date: Wed, 18 Mar 2015 12:22:01 +0200 Message-ID: <20150318102201.GM17419@intel.com> References: <1425294281-7297-1-git-send-email-imre.deak@intel.com> <1426671436.2649.19.camel@tiscali.nl> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <1426671436.2649.19.camel@tiscali.nl> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Paul Bolle Cc: Jani Nikula , Daniel Vetter , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, =?iso-8859-1?Q?Bj=F8rn?= Mork List-Id: dri-devel@lists.freedesktop.org T24gV2VkLCBNYXIgMTgsIDIwMTUgYXQgMTA6Mzc6MTZBTSArMDEwMCwgUGF1bCBCb2xsZSB3cm90 ZToKPiBJbXJlIERlYWsgc2NocmVlZiBvcCBtYSAwMi0wMy0yMDE1IG9tIDEzOjA0IFsrMDIwMF06 Cj4gPiBCasO4cm4gcmVwb3J0ZWQgdGhhdCBoaXMgbWFjaGluZSBoYW5nIGR1cmluZyBoaWJlcm5h dGlvbiBhbmQgZXZlbnR1YWxseQo+ID4gYmlzZWN0ZWQgdGhlIHByb2JsZW0gdG8gdGhlIGZvbGxv d2luZyBjb21taXQ6Cj4gPiAKPiA+IGNvbW1pdCBkYTJiYzFiOWRiMzM1MWFkZGQyOTNlNWI4Mjc1 N2VmZTFmNzdlZDFkCj4gPiBBdXRob3I6IEltcmUgRGVhayA8aW1yZS5kZWFrQGludGVsLmNvbT4K PiA+IERhdGU6ICAgVGh1IE9jdCAyMyAxOToyMzoyNiAyMDE0ICswMzAwCj4gPiAKPiA+ICAgICBk cm0vaTkxNTogYWRkIHBvd2Vyb2ZmX2xhdGUgaGFuZGxlcgo+ID4gCj4gPiBUaGUgcHJvYmxlbSBz ZWVtcyB0byBiZSB0aGF0IGFmdGVyIHRoZSBrZXJuZWwgcHV0cyB0aGUgZGV2aWNlIGludG8gRDMK PiA+IHRoZSBCSU9TIHN0aWxsIHRyaWVzIHRvIGFjY2VzcyBpdCwgb3Igb3RoZXJ3aXNlIGFzc3Vt ZXMgdGhhdCBpdCdzIGluIEQwLgo+ID4gVGhpcyBpcyBjbGVhcmx5IGJvZ3VzLCBzaW5jZSBBQ1BJ IG1hbmRhdGVzIHRoYXQgZGV2aWNlcyBhcmUgcHV0IGludG8gRDMKPiA+IGJ5IHRoZSBPU1BNIGlm IHRoZXkgYXJlIG5vdCB3YWtlLXVwIHNvdXJjZXMuIEluIHRoZSBmdXR1cmUgd2Ugd2FudCB0bwo+ ID4gdW5pZnkgbW9yZSBvZiB0aGUgZHJpdmVyJ3MgcnVudGltZSBhbmQgc3lzdGVtIHN1c3BlbmQg cGF0aHMsIGZvciBleGFtcGxlCj4gPiBieSBza2lwcGluZyBhbGwgdGhlIHN5c3RlbSBzdXNwZW5k L2hpYmVybmF0aW9uIGhvb2tzIGlmIHRoZSBkZXZpY2UgaXMKPiA+IHJ1bnRpbWUgc3VzcGVuZGVk IGFscmVhZHkuIEFjY29yZGluZ2x5IGZvciBhbGwgb3RoZXIgcGxhdGZvcm1zIHRoZSBnb2FsCj4g PiBpcyBzdGlsbCB0byBwcm9wZXJseSBwb3dlciBkb3duIHRoZSBkZXZpY2UgZHVyaW5nIGhpYmVy bmF0aW9uLgo+ID4gCj4gPiB2MjoKPiA+IC0gQW5vdGhlciBHRU40IExlbm92byBsYXB0b3AgaGFk IHRoZSBzYW1lIGlzc3VlLCB3aGlsZSBwbGF0Zm9ybXMgZnJvbQo+ID4gICBvdGhlciB2ZW5kb3Jz IChpbmNsdWRpbmcgbW9iaWxlIGFuZCBkZXNrdG9wLCBHRU40IGFuZCBub24tR0VONCkgc2VlbQo+ ID4gICB0byB3b3JrIGZpbmUuIEJhc2VkIG9uIHRoaXMgYXBwbHkgdGhlIHdvcmthcm91bmQgb24g YWxsIEdFTjQgTGVub3ZvCj4gPiAgIHBsYXRmb3Jtcy4KPiA+IC0gYWRkIGNvZGUgY29tbWVudCBh Ym91dCBmYWlsaW5nIHBsYXRmb3JtcyAoVmlsbGUpCj4gCj4gVGhlIG91dGRhdGVkIFRoaW5rUGFk IFg0MSB0aGF0IEkgdG9ydHVyZSBieSBydW5uaW5nIHJjJ3Mgc2hvd2VkCj4gaWRlbnRpY2FsIHN5 bXB0b21zLCBhbHNvIHNpbmNlIHYzLjE5LXJjMS4gSXQgdXNlcyBhIGdlbjMgY2hpcHNldCAoaXQg aGFzCj4gYSA5MTVHTSwgSSB0aGluaywgYnV0IEkga2VlcCBmb3JnZXR0aW5nIGRldGFpbHMgbGlr ZSB0aGF0KS4KPiAKPiBJIGRpZCBldmVyeXRoaW5nIHdyb25nIHRvIGdldCB0aGlzIGZpeGVkICgx OiBob3BlIHRoaXMgZ2V0cyBtYWdpY2FsbHkKPiBmaXhlZDsgMjogYmlzZWN0IGl0IG15c2VsZiwg dGhpbmtpbmcgZXZlcnkgbm93IGFuZCB0aGVuIHRoYXQgSSBrbm93Cj4gYmV0dGVyIHRoYW4gZ2l0 IGJpc2VjdCB3aGljaCBjb21taXQgdG8gY2hvb3NlOyAzOiBmaW5hbGx5IGdyZXAgbGttbCkuIFNv Cj4gaGVyZSBJIGFtIGxhdGUgdG8gdGhlIHNob3cuCj4gCj4gPiBSZWZlcmVuY2U6IGh0dHA6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvYXJjaGl2ZXMvaW50ZWwtZ2Z4LzIwMTUtRmVicnVhcnkvMDYw NjMzLmh0bWwKPiA+IFJlcG9ydGVkLWFuZC1iaXNlY3RlZC1ieTogQmrDuHJuIE1vcmsgPGJqb3Ju QG1vcmsubm8+Cj4gPiBTaWduZWQtb2ZmLWJ5OiBJbXJlIERlYWsgPGltcmUuZGVha0BpbnRlbC5j b20+Cj4gPiAtLS0KPiA+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jIHwgMzAgKysr KysrKysrKysrKysrKysrKysrKysrKy0tLS0tCj4gPiAgMSBmaWxlIGNoYW5nZWQsIDI1IGluc2Vy dGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCj4gPiAKPiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwo+ ID4gaW5kZXggNGJhZGIyMy4uZmYzNjYyZiAxMDA2NDQKPiA+IC0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmMKPiA+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2 LmMKPiA+IEBAIC02MzcsNyArNjM3LDcgQEAgc3RhdGljIGludCBpOTE1X2RybV9zdXNwZW5kKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCj4gPiAgCXJldHVybiAwOwo+ID4gIH0KPiA+ICAKPiA+IC1z dGF0aWMgaW50IGk5MTVfZHJtX3N1c3BlbmRfbGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZHJtX2Rl dikKPiA+ICtzdGF0aWMgaW50IGk5MTVfZHJtX3N1c3BlbmRfbGF0ZShzdHJ1Y3QgZHJtX2Rldmlj ZSAqZHJtX2RldiwgYm9vbCBoaWJlcm5hdGlvbikKPiA+ICB7Cj4gPiAgCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IGRybV9kZXYtPmRldl9wcml2YXRlOwo+ID4gIAlpbnQgcmV0 Owo+ID4gQEAgLTY1MSw3ICs2NTEsMTcgQEAgc3RhdGljIGludCBpOTE1X2RybV9zdXNwZW5kX2xh dGUoc3RydWN0IGRybV9kZXZpY2UgKmRybV9kZXYpCj4gPiAgCX0KPiA+ICAKPiA+ICAJcGNpX2Rp c2FibGVfZGV2aWNlKGRybV9kZXYtPnBkZXYpOwo+ID4gLQlwY2lfc2V0X3Bvd2VyX3N0YXRlKGRy bV9kZXYtPnBkZXYsIFBDSV9EM2hvdCk7Cj4gPiArCS8qCj4gPiArCSAqIER1cmluZyBoaWJlcm5h dGlvbiBvbiBzb21lIEdFTjQgcGxhdGZvcm1zIHRoZSBCSU9TIG1heSB0cnkgdG8gYWNjZXNzCj4g PiArCSAqIHRoZSBkZXZpY2UgZXZlbiB0aG91Z2ggaXQncyBhbHJlYWR5IGluIEQzIGFuZCBoYW5n IHRoZSBtYWNoaW5lLiBTbwo+ID4gKwkgKiBsZWF2ZSB0aGUgZGV2aWNlIGluIEQwIG9uIHRob3Nl IHBsYXRmb3JtcyBhbmQgaG9wZSB0aGUgQklPUyB3aWxsCj4gPiArCSAqIHBvd2VyIGRvd24gdGhl IGRldmljZSBwcm9wZXJseS4gUGxhdGZvcm1zIHdoZXJlIHRoaXMgd2FzIHNlZW46Cj4gPiArCSAq IExlbm92byBUaGlua3BhZCBYMzAxLCBYNjFzCj4gPiArCSAqLwo+ID4gKwlpZiAoIShoaWJlcm5h dGlvbiAmJgo+ID4gKwkgICAgICBkcm1fZGV2LT5wZGV2LT5zdWJzeXN0ZW1fdmVuZG9yID09IFBD SV9WRU5ET1JfSURfTEVOT1ZPICYmCj4gPiArCSAgICAgIElOVEVMX0lORk8oZGV2X3ByaXYpLT5n ZW4gPT0gNCkpCj4gPiArCQlwY2lfc2V0X3Bvd2VyX3N0YXRlKGRybV9kZXYtPnBkZXYsIFBDSV9E M2hvdCk7Cj4gPiAgCj4gPiAgCXJldHVybiAwOwo+ID4gIH0KPiAKPiBJJ2xsIHBhc3RlIGEgRFJB RlQgcGF0Y2ggdGhhdCBmaXhlcyB0aGlzIGZvciB0aGF0IFg0MSBhdCB0aGUgZW5kIG9mIHRoZQo+ IG1lc3NhZ2UuIFRoZSBwYXRjaCBpcyByYXRoZXIgdWdseS4gU2hvdWxkIHdlIHBlcmhhcHMgdHJ5 IGEgcXVpcmsgdGFibGUKPiBvciBzb21ldGhpbmcgbGlrZSB0aGF0Pwo+IAo+IAo+IFBhdWwgQm9s bGUKPiAKPiAtLS0tLS0tLT44LS0tLS0tLS0KPiBTdWJqZWN0OiBbUEFUQ0hdIGRybS9pOTE1OiB3 b3JrIGFyb3VuZCBoYW5nIGR1cmluZyBoaWJlcm5hdGlvbiBvbiBnZW4zIHRvbwo+IAo+IENvbW1p dCBhYjNiZTczZmE3YjQgKCJkcm0vaTkxNTogZ2VuNDogd29yayBhcm91bmQgaGFuZyBkdXJpbmcK PiBoaWJlcm5hdGlvbiIpIHdhcyB0YXJnZXR0ZWQgYXQgZ2VuNCBwbGF0Zm9ybXMgc2hpcHBlZCBi eSBMZW5vdm8uIFRoZQo+IHNhbWUgcHJvYmxlbSBjYW4gYWxzbyBiZSBzZWVuIG9uIGEgTGVub3Zv IFRoaW5rUGFkIFg0MS4gRXhwYW5kIHRoZSB0ZXN0Cj4gdG8gY2F0Y2ggdGhhdCBzeXN0ZW0gdG9v Lgo+IAo+IFNhZGx5LCB0aGlzIHN5c3RlbSBzdGlsbCB1c2VzIElCTSdzIHN1YnN5c3RlbSB2ZW5k b3IgaWQuIFNvIHdlIGVuZCB1cAo+IHdpdGggYSByYXRoZXIgdW5wbGVhc2FudCB0ZXN0LiBVc2Ug dGhlIElTX0dFTjMoKSBhbmQgSVNfR0VONCgpIG1hY3JvcyB0bwo+IGxlc3NlbiB0aGUgcGFpbiBh IGJpdC4KCldlIGhhZCBhbm90aGVyIGJ1ZyByZXBvcnQgd2hpY2ggc2hvd2VkIHNpbWlsYXIgcHJv YmxlbXMgb24gc29tZXRoaW5nCmFzIHJlY2VudCBhcyBTTkI6Cmh0dHBzOi8vYnVnemlsbGEua2Vy bmVsLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQyNDEKU28gSSBndWVzcyB3ZSByZWFsbHkgd2FudCB0 byBtYWtlIHRoZSBjaGVjayAnZ2VuIDwgNycuCgpNeSBJVkIgWDEgQ2FyYm9uIGRvZXNuJ3QgbmVl ZCB0aGlzIHF1aXJrLCBzbyBob3BlZnVsbHkgdGhhdCBpbmRpY2F0ZXMKdGhlIExlbm92byBCSU9T ZW4gYmVjYW1lIG1vcmUgc2FuZSBmb3IgZ2VuNysuCgo+IAo+IE5vdC15ZXQtc2lnbmVkLW9mZi1i eTogUGF1bCBCb2xsZSA8cGVib2xsZUB0aXNjYWxpLm5sPgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5jIHwgNyArKysrLS0tCj4gIDEgZmlsZSBjaGFuZ2VkLCA0IGluc2Vy dGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCj4gaW5k ZXggY2M2ZWE1M2QyYjgxLi4zYTA3MTY0ZjU4NjAgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2 LmMKPiBAQCAtNjQxLDExICs2NDEsMTIgQEAgc3RhdGljIGludCBpOTE1X2RybV9zdXNwZW5kX2xh dGUoc3RydWN0IGRybV9kZXZpY2UgKmRybV9kZXYsIGJvb2wgaGliZXJuYXRpb24pCj4gIAkgKiB0 aGUgZGV2aWNlIGV2ZW4gdGhvdWdoIGl0J3MgYWxyZWFkeSBpbiBEMyBhbmQgaGFuZyB0aGUgbWFj aGluZS4gU28KPiAgCSAqIGxlYXZlIHRoZSBkZXZpY2UgaW4gRDAgb24gdGhvc2UgcGxhdGZvcm1z IGFuZCBob3BlIHRoZSBCSU9TIHdpbGwKPiAgCSAqIHBvd2VyIGRvd24gdGhlIGRldmljZSBwcm9w ZXJseS4gUGxhdGZvcm1zIHdoZXJlIHRoaXMgd2FzIHNlZW46Cj4gLQkgKiBMZW5vdm8gVGhpbmtw YWQgWDMwMSwgWDYxcwo+ICsJICogTGVub3ZvIFRoaW5rcGFkIFgzMDEsIFg2MXMsIFg0MQo+ICAJ ICovCj4gIAlpZiAoIShoaWJlcm5hdGlvbiAmJgo+IC0JICAgICAgZHJtX2Rldi0+cGRldi0+c3Vi c3lzdGVtX3ZlbmRvciA9PSBQQ0lfVkVORE9SX0lEX0xFTk9WTyAmJgo+IC0JICAgICAgSU5URUxf SU5GTyhkZXZfcHJpdiktPmdlbiA9PSA0KSkKPiArCSAgICAgIChkcm1fZGV2LT5wZGV2LT5zdWJz eXN0ZW1fdmVuZG9yID09IFBDSV9WRU5ET1JfSURfTEVOT1ZPIHx8Cj4gKwkgICAgICAgZHJtX2Rl di0+cGRldi0+c3Vic3lzdGVtX3ZlbmRvciA9PSBQQ0lfU1VCVkVORE9SX0lEX0lCTSkgJiYKPiAr CSAgICAgIChJU19HRU4zKGRldl9wcml2KSB8fCBJU19HRU40KGRldl9wcml2KSkpKQo+ICAJCXBj aV9zZXRfcG93ZXJfc3RhdGUoZHJtX2Rldi0+cGRldiwgUENJX0QzaG90KTsKPiAgCj4gIAlyZXR1 cm4gMDsKPiAtLSAKPiAyLjEuMAoKLS0gClZpbGxlIFN5cmrDpGzDpApJbnRlbCBPVEMKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxp bmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755889AbbCRKWK (ORCPT ); Wed, 18 Mar 2015 06:22:10 -0400 Received: from mga09.intel.com ([134.134.136.24]:37411 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755392AbbCRKWH (ORCPT ); Wed, 18 Mar 2015 06:22:07 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,422,1422950400"; d="scan'208";a="468856190" Date: Wed, 18 Mar 2015 12:22:01 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Paul Bolle Cc: Imre Deak , intel-gfx@lists.freedesktop.org, =?iso-8859-1?Q?Bj=F8rn?= Mork , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter , Jani Nikula , David Weinehall Subject: Re: [PATCH v2] drm/i915: gen4: work around hang during hibernation Message-ID: <20150318102201.GM17419@intel.com> References: <1425294281-7297-1-git-send-email-imre.deak@intel.com> <1426671436.2649.19.camel@tiscali.nl> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1426671436.2649.19.camel@tiscali.nl> 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 On Wed, Mar 18, 2015 at 10:37:16AM +0100, Paul Bolle wrote: > Imre Deak schreef op ma 02-03-2015 om 13:04 [+0200]: > > Bjørn reported that his machine hang during hibernation and eventually > > bisected the problem to the following commit: > > > > commit da2bc1b9db3351addd293e5b82757efe1f77ed1d > > Author: Imre Deak > > Date: Thu Oct 23 19:23:26 2014 +0300 > > > > drm/i915: add poweroff_late handler > > > > The problem seems to be that after the kernel puts the device into D3 > > the BIOS still tries to access it, or otherwise assumes that it's in D0. > > This is clearly bogus, since ACPI mandates that devices are put into D3 > > by the OSPM if they are not wake-up sources. In the future we want to > > unify more of the driver's runtime and system suspend paths, for example > > by skipping all the system suspend/hibernation hooks if the device is > > runtime suspended already. Accordingly for all other platforms the goal > > is still to properly power down the device during hibernation. > > > > v2: > > - Another GEN4 Lenovo laptop had the same issue, while platforms from > > other vendors (including mobile and desktop, GEN4 and non-GEN4) seem > > to work fine. Based on this apply the workaround on all GEN4 Lenovo > > platforms. > > - add code comment about failing platforms (Ville) > > The outdated ThinkPad X41 that I torture by running rc's showed > identical symptoms, also since v3.19-rc1. It uses a gen3 chipset (it has > a 915GM, I think, but I keep forgetting details like that). > > I did everything wrong to get this fixed (1: hope this gets magically > fixed; 2: bisect it myself, thinking every now and then that I know > better than git bisect which commit to choose; 3: finally grep lkml). So > here I am late to the show. > > > Reference: http://lists.freedesktop.org/archives/intel-gfx/2015-February/060633.html > > Reported-and-bisected-by: Bjørn Mork > > Signed-off-by: Imre Deak > > --- > > drivers/gpu/drm/i915/i915_drv.c | 30 +++++++++++++++++++++++++----- > > 1 file changed, 25 insertions(+), 5 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > > index 4badb23..ff3662f 100644 > > --- a/drivers/gpu/drm/i915/i915_drv.c > > +++ b/drivers/gpu/drm/i915/i915_drv.c > > @@ -637,7 +637,7 @@ static int i915_drm_suspend(struct drm_device *dev) > > return 0; > > } > > > > -static int i915_drm_suspend_late(struct drm_device *drm_dev) > > +static int i915_drm_suspend_late(struct drm_device *drm_dev, bool hibernation) > > { > > struct drm_i915_private *dev_priv = drm_dev->dev_private; > > int ret; > > @@ -651,7 +651,17 @@ static int i915_drm_suspend_late(struct drm_device *drm_dev) > > } > > > > pci_disable_device(drm_dev->pdev); > > - pci_set_power_state(drm_dev->pdev, PCI_D3hot); > > + /* > > + * During hibernation on some GEN4 platforms the BIOS may try to access > > + * the device even though it's already in D3 and hang the machine. So > > + * leave the device in D0 on those platforms and hope the BIOS will > > + * power down the device properly. Platforms where this was seen: > > + * Lenovo Thinkpad X301, X61s > > + */ > > + if (!(hibernation && > > + drm_dev->pdev->subsystem_vendor == PCI_VENDOR_ID_LENOVO && > > + INTEL_INFO(dev_priv)->gen == 4)) > > + pci_set_power_state(drm_dev->pdev, PCI_D3hot); > > > > return 0; > > } > > I'll paste a DRAFT patch that fixes this for that X41 at the end of the > message. The patch is rather ugly. Should we perhaps try a quirk table > or something like that? > > > Paul Bolle > > -------->8-------- > Subject: [PATCH] drm/i915: work around hang during hibernation on gen3 too > > Commit ab3be73fa7b4 ("drm/i915: gen4: work around hang during > hibernation") was targetted at gen4 platforms shipped by Lenovo. The > same problem can also be seen on a Lenovo ThinkPad X41. Expand the test > to catch that system too. > > Sadly, this system still uses IBM's subsystem vendor id. So we end up > with a rather unpleasant test. Use the IS_GEN3() and IS_GEN4() macros to > lessen the pain a bit. We had another bug report which showed similar problems on something as recent as SNB: https://bugzilla.kernel.org/show_bug.cgi?id=94241 So I guess we really want to make the check 'gen < 7'. My IVB X1 Carbon doesn't need this quirk, so hopefully that indicates the Lenovo BIOSen became more sane for gen7+. > > Not-yet-signed-off-by: Paul Bolle > --- > drivers/gpu/drm/i915/i915_drv.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index cc6ea53d2b81..3a07164f5860 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -641,11 +641,12 @@ static int i915_drm_suspend_late(struct drm_device *drm_dev, bool hibernation) > * the device even though it's already in D3 and hang the machine. So > * leave the device in D0 on those platforms and hope the BIOS will > * power down the device properly. Platforms where this was seen: > - * Lenovo Thinkpad X301, X61s > + * Lenovo Thinkpad X301, X61s, X41 > */ > if (!(hibernation && > - drm_dev->pdev->subsystem_vendor == PCI_VENDOR_ID_LENOVO && > - INTEL_INFO(dev_priv)->gen == 4)) > + (drm_dev->pdev->subsystem_vendor == PCI_VENDOR_ID_LENOVO || > + drm_dev->pdev->subsystem_vendor == PCI_SUBVENDOR_ID_IBM) && > + (IS_GEN3(dev_priv) || IS_GEN4(dev_priv)))) > pci_set_power_state(drm_dev->pdev, PCI_D3hot); > > return 0; > -- > 2.1.0 -- Ville Syrjälä Intel OTC