From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH v2] drm/i915: gen4: work around hang during hibernation Date: Mon, 02 Mar 2015 14:29:25 +0200 Message-ID: <87385n60re.fsf@intel.com> References: <1425294281-7297-1-git-send-email-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1425294281-7297-1-git-send-email-imre.deak@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Imre Deak , intel-gfx@lists.freedesktop.org Cc: Daniel Vetter , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, =?utf-8?Q?Bj=C3=B8rn?= Mork List-Id: dri-devel@lists.freedesktop.org T24gTW9uLCAwMiBNYXIgMjAxNSwgSW1yZSBEZWFrIDxpbXJlLmRlYWtAaW50ZWwuY29tPiB3cm90 ZToKPiBCasO4cm4gcmVwb3J0ZWQgdGhhdCBoaXMgbWFjaGluZSBoYW5nIGR1cmluZyBoaWJlcm5h dGlvbiBhbmQgZXZlbnR1YWxseQo+IGJpc2VjdGVkIHRoZSBwcm9ibGVtIHRvIHRoZSBmb2xsb3dp bmcgY29tbWl0Ogo+Cj4gY29tbWl0IGRhMmJjMWI5ZGIzMzUxYWRkZDI5M2U1YjgyNzU3ZWZlMWY3 N2VkMWQKPiBBdXRob3I6IEltcmUgRGVhayA8aW1yZS5kZWFrQGludGVsLmNvbT4KPiBEYXRlOiAg IFRodSBPY3QgMjMgMTk6MjM6MjYgMjAxNCArMDMwMAo+Cj4gICAgIGRybS9pOTE1OiBhZGQgcG93 ZXJvZmZfbGF0ZSBoYW5kbGVyCj4KPiBUaGUgcHJvYmxlbSBzZWVtcyB0byBiZSB0aGF0IGFmdGVy IHRoZSBrZXJuZWwgcHV0cyB0aGUgZGV2aWNlIGludG8gRDMKPiB0aGUgQklPUyBzdGlsbCB0cmll cyB0byBhY2Nlc3MgaXQsIG9yIG90aGVyd2lzZSBhc3N1bWVzIHRoYXQgaXQncyBpbiBEMC4KPiBU aGlzIGlzIGNsZWFybHkgYm9ndXMsIHNpbmNlIEFDUEkgbWFuZGF0ZXMgdGhhdCBkZXZpY2VzIGFy ZSBwdXQgaW50byBEMwo+IGJ5IHRoZSBPU1BNIGlmIHRoZXkgYXJlIG5vdCB3YWtlLXVwIHNvdXJj ZXMuIEluIHRoZSBmdXR1cmUgd2Ugd2FudCB0bwo+IHVuaWZ5IG1vcmUgb2YgdGhlIGRyaXZlcidz IHJ1bnRpbWUgYW5kIHN5c3RlbSBzdXNwZW5kIHBhdGhzLCBmb3IgZXhhbXBsZQo+IGJ5IHNraXBw aW5nIGFsbCB0aGUgc3lzdGVtIHN1c3BlbmQvaGliZXJuYXRpb24gaG9va3MgaWYgdGhlIGRldmlj ZSBpcwo+IHJ1bnRpbWUgc3VzcGVuZGVkIGFscmVhZHkuIEFjY29yZGluZ2x5IGZvciBhbGwgb3Ro ZXIgcGxhdGZvcm1zIHRoZSBnb2FsCj4gaXMgc3RpbGwgdG8gcHJvcGVybHkgcG93ZXIgZG93biB0 aGUgZGV2aWNlIGR1cmluZyBoaWJlcm5hdGlvbi4KPgo+IHYyOgo+IC0gQW5vdGhlciBHRU40IExl bm92byBsYXB0b3AgaGFkIHRoZSBzYW1lIGlzc3VlLCB3aGlsZSBwbGF0Zm9ybXMgZnJvbQo+ICAg b3RoZXIgdmVuZG9ycyAoaW5jbHVkaW5nIG1vYmlsZSBhbmQgZGVza3RvcCwgR0VONCBhbmQgbm9u LUdFTjQpIHNlZW0KPiAgIHRvIHdvcmsgZmluZS4gQmFzZWQgb24gdGhpcyBhcHBseSB0aGUgd29y a2Fyb3VuZCBvbiBhbGwgR0VONCBMZW5vdm8KPiAgIHBsYXRmb3Jtcy4KPiAtIGFkZCBjb2RlIGNv bW1lbnQgYWJvdXQgZmFpbGluZyBwbGF0Zm9ybXMgKFZpbGxlKQo+Cj4gUmVmZXJlbmNlOiBodHRw Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL2FyY2hpdmVzL2ludGVsLWdmeC8yMDE1LUZlYnJ1YXJ5 LzA2MDYzMy5odG1sCj4gUmVwb3J0ZWQtYW5kLWJpc2VjdGVkLWJ5OiBCasO4cm4gTW9yayA8Ympv cm5AbW9yay5ubz4KPiBTaWduZWQtb2ZmLWJ5OiBJbXJlIERlYWsgPGltcmUuZGVha0BpbnRlbC5j b20+CgpCasO4cm4sIEkgd291bGQgcmVhbGx5IGFwcHJlY2lhdGUgeW91ciBUZXN0ZWQtYnkgb24g dGhpcyBwYXRjaCBiZWZvcmUgSQpxdWV1ZSBpdCBmb3IgdjQuMCBhbmQgY2M6IHN0YWJsZSBmb3Ig djMuMTkuCgpCUiwKSmFuaS4KCgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5jIHwgMzAgKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tCj4gIDEgZmlsZSBjaGFuZ2Vk LCAyNSBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQo+Cj4gZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5jCj4gaW5kZXggNGJhZGIyMy4uZmYzNjYyZiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu Ywo+IEBAIC02MzcsNyArNjM3LDcgQEAgc3RhdGljIGludCBpOTE1X2RybV9zdXNwZW5kKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCj4gIAlyZXR1cm4gMDsKPiAgfQo+ICAKPiAtc3RhdGljIGludCBp OTE1X2RybV9zdXNwZW5kX2xhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRybV9kZXYpCj4gK3N0YXRp YyBpbnQgaTkxNV9kcm1fc3VzcGVuZF9sYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkcm1fZGV2LCBi b29sIGhpYmVybmF0aW9uKQo+ICB7Cj4gIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSBkcm1fZGV2LT5kZXZfcHJpdmF0ZTsKPiAgCWludCByZXQ7Cj4gQEAgLTY1MSw3ICs2NTEs MTcgQEAgc3RhdGljIGludCBpOTE1X2RybV9zdXNwZW5kX2xhdGUoc3RydWN0IGRybV9kZXZpY2Ug KmRybV9kZXYpCj4gIAl9Cj4gIAo+ICAJcGNpX2Rpc2FibGVfZGV2aWNlKGRybV9kZXYtPnBkZXYp Owo+IC0JcGNpX3NldF9wb3dlcl9zdGF0ZShkcm1fZGV2LT5wZGV2LCBQQ0lfRDNob3QpOwo+ICsJ LyoKPiArCSAqIER1cmluZyBoaWJlcm5hdGlvbiBvbiBzb21lIEdFTjQgcGxhdGZvcm1zIHRoZSBC SU9TIG1heSB0cnkgdG8gYWNjZXNzCj4gKwkgKiB0aGUgZGV2aWNlIGV2ZW4gdGhvdWdoIGl0J3Mg YWxyZWFkeSBpbiBEMyBhbmQgaGFuZyB0aGUgbWFjaGluZS4gU28KPiArCSAqIGxlYXZlIHRoZSBk ZXZpY2UgaW4gRDAgb24gdGhvc2UgcGxhdGZvcm1zIGFuZCBob3BlIHRoZSBCSU9TIHdpbGwKPiAr CSAqIHBvd2VyIGRvd24gdGhlIGRldmljZSBwcm9wZXJseS4gUGxhdGZvcm1zIHdoZXJlIHRoaXMg d2FzIHNlZW46Cj4gKwkgKiBMZW5vdm8gVGhpbmtwYWQgWDMwMSwgWDYxcwo+ICsJICovCj4gKwlp ZiAoIShoaWJlcm5hdGlvbiAmJgo+ICsJICAgICAgZHJtX2Rldi0+cGRldi0+c3Vic3lzdGVtX3Zl bmRvciA9PSBQQ0lfVkVORE9SX0lEX0xFTk9WTyAmJgo+ICsJICAgICAgSU5URUxfSU5GTyhkZXZf cHJpdiktPmdlbiA9PSA0KSkKPiArCQlwY2lfc2V0X3Bvd2VyX3N0YXRlKGRybV9kZXYtPnBkZXYs IFBDSV9EM2hvdCk7Cj4gIAo+ICAJcmV0dXJuIDA7Cj4gIH0KPiBAQCAtNjc3LDcgKzY4Nyw3IEBA IGludCBpOTE1X3N1c3BlbmRfbGVnYWN5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHBtX21lc3Nh Z2VfdCBzdGF0ZSkKPiAgCWlmIChlcnJvcikKPiAgCQlyZXR1cm4gZXJyb3I7Cj4gIAo+IC0JcmV0 dXJuIGk5MTVfZHJtX3N1c3BlbmRfbGF0ZShkZXYpOwo+ICsJcmV0dXJuIGk5MTVfZHJtX3N1c3Bl bmRfbGF0ZShkZXYsIGZhbHNlKTsKPiAgfQo+ICAKPiAgc3RhdGljIGludCBpOTE1X2RybV9yZXN1 bWUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKPiBAQCAtOTY1LDcgKzk3NSwxNyBAQCBzdGF0aWMg aW50IGk5MTVfcG1fc3VzcGVuZF9sYXRlKHN0cnVjdCBkZXZpY2UgKmRldikKPiAgCWlmIChkcm1f ZGV2LT5zd2l0Y2hfcG93ZXJfc3RhdGUgPT0gRFJNX1NXSVRDSF9QT1dFUl9PRkYpCj4gIAkJcmV0 dXJuIDA7Cj4gIAo+IC0JcmV0dXJuIGk5MTVfZHJtX3N1c3BlbmRfbGF0ZShkcm1fZGV2KTsKPiAr CXJldHVybiBpOTE1X2RybV9zdXNwZW5kX2xhdGUoZHJtX2RldiwgZmFsc2UpOwo+ICt9Cj4gKwo+ ICtzdGF0aWMgaW50IGk5MTVfcG1fcG93ZXJvZmZfbGF0ZShzdHJ1Y3QgZGV2aWNlICpkZXYpCj4g K3sKPiArCXN0cnVjdCBkcm1fZGV2aWNlICpkcm1fZGV2ID0gZGV2X3RvX2k5MTUoZGV2KS0+ZGV2 Owo+ICsKPiArCWlmIChkcm1fZGV2LT5zd2l0Y2hfcG93ZXJfc3RhdGUgPT0gRFJNX1NXSVRDSF9Q T1dFUl9PRkYpCj4gKwkJcmV0dXJuIDA7Cj4gKwo+ICsJcmV0dXJuIGk5MTVfZHJtX3N1c3BlbmRf bGF0ZShkcm1fZGV2LCB0cnVlKTsKPiAgfQo+ICAKPiAgc3RhdGljIGludCBpOTE1X3BtX3Jlc3Vt ZV9lYXJseShzdHJ1Y3QgZGV2aWNlICpkZXYpCj4gQEAgLTE1MzUsNyArMTU1NSw3IEBAIHN0YXRp YyBjb25zdCBzdHJ1Y3QgZGV2X3BtX29wcyBpOTE1X3BtX29wcyA9IHsKPiAgCS50aGF3X2Vhcmx5 ID0gaTkxNV9wbV9yZXN1bWVfZWFybHksCj4gIAkudGhhdyA9IGk5MTVfcG1fcmVzdW1lLAo+ICAJ LnBvd2Vyb2ZmID0gaTkxNV9wbV9zdXNwZW5kLAo+IC0JLnBvd2Vyb2ZmX2xhdGUgPSBpOTE1X3Bt X3N1c3BlbmRfbGF0ZSwKPiArCS5wb3dlcm9mZl9sYXRlID0gaTkxNV9wbV9wb3dlcm9mZl9sYXRl LAo+ICAJLnJlc3RvcmVfZWFybHkgPSBpOTE1X3BtX3Jlc3VtZV9lYXJseSwKPiAgCS5yZXN0b3Jl ID0gaTkxNV9wbV9yZXN1bWUsCj4gIAo+IC0tIAo+IDIuMS4wCj4KCi0tIApKYW5pIE5pa3VsYSwg SW50ZWwgT3BlbiBTb3VyY2UgVGVjaG5vbG9neSBDZW50ZXIKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1n ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9pbnRlbC1nZngK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753819AbbCBM2R (ORCPT ); Mon, 2 Mar 2015 07:28:17 -0500 Received: from mga09.intel.com ([134.134.136.24]:35308 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750959AbbCBM2O convert rfc822-to-8bit (ORCPT ); Mon, 2 Mar 2015 07:28:14 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.09,675,1418112000"; d="scan'208";a="685520856" From: Jani Nikula To: Imre Deak , intel-gfx@lists.freedesktop.org Cc: =?utf-8?Q?Bj=C3=B8rn?= Mork , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter , Ville =?utf-8?B?U3lyasOkbMOk?= , David Weinehall Subject: Re: [PATCH v2] drm/i915: gen4: work around hang during hibernation In-Reply-To: <1425294281-7297-1-git-send-email-imre.deak@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <1425294281-7297-1-git-send-email-imre.deak@intel.com> User-Agent: Notmuch/0.19+67~g70b5ead (http://notmuchmail.org) Emacs/24.4.1 (x86_64-pc-linux-gnu) Date: Mon, 02 Mar 2015 14:29:25 +0200 Message-ID: <87385n60re.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 02 Mar 2015, Imre Deak wrote: > 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) > > Reference: http://lists.freedesktop.org/archives/intel-gfx/2015-February/060633.html > Reported-and-bisected-by: Bjørn Mork > Signed-off-by: Imre Deak Bjørn, I would really appreciate your Tested-by on this patch before I queue it for v4.0 and cc: stable for v3.19. BR, Jani. > --- > 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; > } > @@ -677,7 +687,7 @@ int i915_suspend_legacy(struct drm_device *dev, pm_message_t state) > if (error) > return error; > > - return i915_drm_suspend_late(dev); > + return i915_drm_suspend_late(dev, false); > } > > static int i915_drm_resume(struct drm_device *dev) > @@ -965,7 +975,17 @@ static int i915_pm_suspend_late(struct device *dev) > if (drm_dev->switch_power_state == DRM_SWITCH_POWER_OFF) > return 0; > > - return i915_drm_suspend_late(drm_dev); > + return i915_drm_suspend_late(drm_dev, false); > +} > + > +static int i915_pm_poweroff_late(struct device *dev) > +{ > + struct drm_device *drm_dev = dev_to_i915(dev)->dev; > + > + if (drm_dev->switch_power_state == DRM_SWITCH_POWER_OFF) > + return 0; > + > + return i915_drm_suspend_late(drm_dev, true); > } > > static int i915_pm_resume_early(struct device *dev) > @@ -1535,7 +1555,7 @@ static const struct dev_pm_ops i915_pm_ops = { > .thaw_early = i915_pm_resume_early, > .thaw = i915_pm_resume, > .poweroff = i915_pm_suspend, > - .poweroff_late = i915_pm_suspend_late, > + .poweroff_late = i915_pm_poweroff_late, > .restore_early = i915_pm_resume_early, > .restore = i915_pm_resume, > > -- > 2.1.0 > -- Jani Nikula, Intel Open Source Technology Center