From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Kroah-Hartman Subject: Re: Potential BUG in drm/i915/execlists: Reset RING registers upon resume Date: Wed, 12 Apr 2017 15:55:10 +0200 Message-ID: <20170412135510.GA6989@kroah.com> References: <1489443835.5568.7.camel@mailbox.org> <87fui8at69.fsf@intel.com> <20170320151358.GB14800@kroah.com> <20170412125521.GA10624@kroah.com> <87tw5twxxo.fsf@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id A88B16E1F1 for ; Wed, 12 Apr 2017 13:55:20 +0000 (UTC) Content-Disposition: inline In-Reply-To: <87tw5twxxo.fsf@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Jani Nikula Cc: Damian Dominik Martinez Dreyer , intel-gfx@lists.freedesktop.org, stable@vger.kernel.org, Eric Blau List-Id: intel-gfx@lists.freedesktop.org T24gV2VkLCBBcHIgMTIsIDIwMTcgYXQgMDQ6MzU6NDdQTSArMDMwMCwgSmFuaSBOaWt1bGEgd3Jv dGU6Cj4gT24gV2VkLCAxMiBBcHIgMjAxNywgR3JlZyBLcm9haC1IYXJ0bWFuIDxncmVna2hAbGlu dXhmb3VuZGF0aW9uLm9yZz4gd3JvdGU6Cj4gPiBPbiBNb24sIE1hciAyMCwgMjAxNyBhdCAxMToy NDozOEFNIC0wNDAwLCBFcmljIEJsYXUgd3JvdGU6Cj4gPj4gT24gTW9uLCBNYXIgMjAsIDIwMTcg YXQgMTE6MTMgQU0sIEdyZWcgS3JvYWgtSGFydG1hbgo+ID4+IDxncmVna2hAbGludXhmb3VuZGF0 aW9uLm9yZz4gd3JvdGU6Cj4gPj4gPiBPbiBNb24sIE1hciAyMCwgMjAxNyBhdCAwNTowMTozNFBN ICswMjAwLCBKYW5pIE5pa3VsYSB3cm90ZToKPiA+PiA+PiBPbiBUdWUsIDE0IE1hciAyMDE3LCBF cmljIEJsYXUgPGVibGF1QGVibGF1LmNvbT4gd3JvdGU6Cj4gPj4gPj4gPiBUaGF0J3MgZnVubnku IEkgaGF2ZSBhIE1hY0Jvb2sgUHJvIDEyLDEgZnJvbSBsYXRlIDIwMTUuIEhpYmVybmF0ZQo+ID4+ ID4+ID4gZmFpbGVkIGZvciBtZSBpbiA0LjkuNiB0aHJvdWdoIDQuOS44IChwb3NzaWJseSBlYXJs aWVyIGFzIHdlbGwsIEkgZG8KPiA+PiA+PiA+IG5vIHJlY2FsbCkgd2l0aG91dCB0aGUgcGF0Y2gu IFRoZSBwYXRjaCB5b3UgcmVmZXJlbmNlIGZpeGVkIG15IHByb2JsZW0KPiA+PiA+PiA+IGFuZCBh cHBhcmVudGx5IG1hbnkgb3RoZXJzIGJhc2VkIG9uIHRoZSBidWcgcmVwb3J0czoKPiA+PiA+PiA+ Cj4gPj4gPj4gPiBodHRwczovL2J1Z3MuZnJlZWRlc2t0b3Aub3JnL3Nob3dfYnVnLmNnaT9pZD05 NjUyNgo+ID4+ID4+ID4KPiA+PiA+PiA+IEkgYXBwbGllZCB0aGUgcGF0Y2ggbXlzZWxmIGluIDQu OS42IHRocm91Z2ggNC45LjggYW5kIGhpYmVybmF0ZSB3b3Jrcwo+ID4+ID4+ID4gZm9yIG1lLiBJ IGhhdmUgcnVuIHZhbmlsbGEgNC45LjkgYW5kIDQuMTAuMSBhbmQgaW4gYm90aCBoaWJlcm5hdGUK PiA+PiA+PiA+IHdvcmtzLgo+ID4+ID4+Cj4gPj4gPj4gU28gSSdtIHF1aXRlIHN1cnByaXNlZAo+ ID4+ID4+Cj4gPj4gPj4gY29tbWl0IGYyYTA0MDlhMDg1MDJkNjRmYmUzOTkwMzU0ZGZmNTkwMmIw OGQyZmIKPiA+PiA+PiBBdXRob3I6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNv LnVrPgo+ID4+ID4+IERhdGU6ICAgV2VkIFNlcCAyMSAxNDo1MTowOCAyMDE2ICswMTAwCj4gPj4g Pj4KPiA+PiA+PiAgICAgZHJtL2k5MTUvZXhlY2xpc3RzOiBSZXNldCBSSU5HIHJlZ2lzdGVycyB1 cG9uIHJlc3VtZQo+ID4+ID4+Cj4gPj4gPj4gICAgIGNvbW1pdCBiYWZiMmY3ZDQ3NTViZjE1NzFi ZDVlOWEwM2I5N2YzZmM0ZmU2OWFlIHVwc3RyZWFtLgo+ID4+ID4+Cj4gPj4gPj4gZW5kZWQgdXAg aW4gdjQuOS45IGNvbnNpZGVyaW5nIHRoYXQgdGhlIHVwc3RyZWFtIGNvbW1pdCBpcyBub3QgYW5u b3RhdGVkCj4gPj4gPj4gZm9yIHN0YWJsZSwgaXQgaGFzIG5vIEZpeGVzOiB0YWdzLCBhbmQgSSBj YW4ndCBmaW5kIGFueSBiYWNrcG9ydAo+ID4+ID4+IHJlcXVlc3RzIG9yIGV2ZW4gbm90aWZpY2F0 aW9ucyBmb3IgaXQgaW4gbXkgbWFpbHMuIChBZG1pdHRlZGx5IEknbSBub3QKPiA+PiA+PiBzdWJz Y3JpYmVkIG9uIHN0YWJsZUAsIGJ1dCBJJ2QgZXhwZWN0IG91ciBsaXN0cywgbWFpbnRhaW5lcnMg b3IKPiA+PiA+PiBkZXZlbG9wZXJzIGJlIENjJ2QuKQo+ID4+ID4KPiA+PiA+IEVyaWMgc2VudCB0 aGlzIHRvIHRoZSBzdGFibGUgbGlzdCBhIGZldyB0aW1lcywgbXkgbWlzdGFrZSBmb3Igbm90IHNl ZWluZwo+ID4+ID4gaGUgaGFkbid0IGFsc28gY2M6ZWQgdGhlIGRldmVsb3BlciBsaXN0Lgo+ID4+ ID4KPiA+PiA+IFdhbnQgbWUgdG8gcmV2ZXJ0IGl0Pwo+ID4+ID4KPiA+PiA+IHRoYW5rcywKPiA+ PiA+Cj4gPj4gPiBncmVnIGstaAo+ID4+IAo+ID4+IE15IGFwb2xvZ2llcy4gSSdtIG5ldyB0byBy ZXF1ZXN0aW5nIHN0YWJsZSBwYXRjaGVzLCBidXQgSSB0aG91Z2h0Cj4gPj4gc2VuZGluZyB0byB0 aGUgc3RhYmxlIG1haWxpbmcgbGlzdHMgd291bGQga2VlcCB0aGUgcHJvcGVyIGZvbGtzIGluIHRo ZQo+ID4+IGxvb3AuIFNvcnJ5IGFib3V0IHRoYXQuCj4gPj4gCj4gPj4gVGhlIGJ1ZyB0aGF0IHRo ZSBjb21taXQgZml4ZXMgaGFzIHF1aXRlIGEgbG9uZyBkb2N1bWVudGF0aW9uIHRyYWlsOgo+ID4+ IAo+ID4+IFtCQVQgZXhlY2xpc3RzXSBTcG9yYWRpYyAtIGdlbV9leGVjX3N1c3BlbmQgYmFzaWMt czQgR1BVIGhhbmcgYWZ0ZXIgcmVzdW1lCj4gPj4gaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9OTY1MjYKPiA+PiAKPiA+PiBJJ3ZlIGhhZCBwcm9ibGVtcyB3aXRo IHRoYXQgb25lIGFuZCB0aGlzIG9uZSB0aGF0IGlzIG5vdCBmaXhlZCBpbiA0LjEwLnggc3RhYmxl Ogo+ID4+IAo+ID4+IFtSZWdyZXNzaW9uIEJEV10ga2VybmVsIHBhbmljIGluIEludGVsIGk5MTUg bW9kdWxlLCBjb21wbGV0ZSBzeXN0ZW0KPiA+PiBmcmVlemUgaW4gNC4xMC1yYzIKPiA+PiBodHRw czovL2J1Z3MuZnJlZWRlc2t0b3Aub3JnL3Nob3dfYnVnLmNnaT9pZD05OTI5NQo+ID4KPiA+IFNv LCB3aGF0IG5lZWRzIHRvIGJlIGRvbmUgaGVyZT8KPiA+Cj4gPiBEbyBJIG5lZWQgdG8gcmV2ZXJ0 IHNvbWV0aGluZyBpbiA0Ljk/IEFkZCBzb21ldGhpbmc/ICBEbyBzb21ldGhpbmcgZWxzZT8KPiA+ Cj4gPiB0b3RhbGx5IGNvbmZ1c2VkLAo+IAo+IEkgZGlkIHJlcGx5IHRvIHlvdSBbMV06Cj4gCj4g Pj4gV2FudCBtZSB0byByZXZlcnQgaXQ/Cj4gPgo+ID4gQ2hyaXMgc2F5cyB0aGF0IHdvdWxkIGJl IHRoZSBjb3JyZWN0IHRoaW5nIHRvIGRvLiBJJ20gbm8gZXhwZXJ0IGluIHRoZQo+ID4gYXJlYSwg YnV0IElJVUMgaGF2aW5nIGp1c3QgdGhhdCBjb21taXQgYmFja3BvcnRlZCBpcyBub3QgZW5vdWdo LAo+ID4gc29tZXRoaW5nIG1vcmUgd291bGQgYmUgbmVlZGVkLCBidXQgd2UncmUgbm90IHN1cmUg eWV0IHdoYXQgZXhhY3RseSBhbmQKPiA+IGlmIHRob3NlIGRlcGVuZGVuY2llcyBjYW4gZWFzaWx5 IGJlIGJhY2twb3J0ZWQuCj4gCj4gIml0IiBiZWluZyBjb21taXQgZjJhMDQwOWEwODUwICgiZHJt L2k5MTUvZXhlY2xpc3RzOiBSZXNldCBSSU5HCj4gcmVnaXN0ZXJzIHVwb24gcmVzdW1lIikgaW4g NC45LjkrLgoKQWgsIG9rLCBub3cgcmV2ZXJ0ZWQsIHRoYW5rcy4KCmdyZWcgay1oCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:36230 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751123AbdDLNzV (ORCPT ); Wed, 12 Apr 2017 09:55:21 -0400 Date: Wed, 12 Apr 2017 15:55:10 +0200 From: Greg Kroah-Hartman To: Jani Nikula Cc: Eric Blau , Damian Dominik Martinez Dreyer , intel-gfx@lists.freedesktop.org, stable@vger.kernel.org, Chris Wilson Subject: Re: [Intel-gfx] Potential BUG in drm/i915/execlists: Reset RING registers upon resume Message-ID: <20170412135510.GA6989@kroah.com> References: <1489443835.5568.7.camel@mailbox.org> <87fui8at69.fsf@intel.com> <20170320151358.GB14800@kroah.com> <20170412125521.GA10624@kroah.com> <87tw5twxxo.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87tw5twxxo.fsf@intel.com> Sender: stable-owner@vger.kernel.org List-ID: On Wed, Apr 12, 2017 at 04:35:47PM +0300, Jani Nikula wrote: > On Wed, 12 Apr 2017, Greg Kroah-Hartman wrote: > > On Mon, Mar 20, 2017 at 11:24:38AM -0400, Eric Blau wrote: > >> On Mon, Mar 20, 2017 at 11:13 AM, Greg Kroah-Hartman > >> wrote: > >> > On Mon, Mar 20, 2017 at 05:01:34PM +0200, Jani Nikula wrote: > >> >> On Tue, 14 Mar 2017, Eric Blau wrote: > >> >> > That's funny. I have a MacBook Pro 12,1 from late 2015. Hibernate > >> >> > failed for me in 4.9.6 through 4.9.8 (possibly earlier as well, I do > >> >> > no recall) without the patch. The patch you reference fixed my problem > >> >> > and apparently many others based on the bug reports: > >> >> > > >> >> > https://bugs.freedesktop.org/show_bug.cgi?id=96526 > >> >> > > >> >> > I applied the patch myself in 4.9.6 through 4.9.8 and hibernate works > >> >> > for me. I have run vanilla 4.9.9 and 4.10.1 and in both hibernate > >> >> > works. > >> >> > >> >> So I'm quite surprised > >> >> > >> >> commit f2a0409a08502d64fbe3990354dff5902b08d2fb > >> >> Author: Chris Wilson > >> >> Date: Wed Sep 21 14:51:08 2016 +0100 > >> >> > >> >> drm/i915/execlists: Reset RING registers upon resume > >> >> > >> >> commit bafb2f7d4755bf1571bd5e9a03b97f3fc4fe69ae upstream. > >> >> > >> >> ended up in v4.9.9 considering that the upstream commit is not annotated > >> >> for stable, it has no Fixes: tags, and I can't find any backport > >> >> requests or even notifications for it in my mails. (Admittedly I'm not > >> >> subscribed on stable@, but I'd expect our lists, maintainers or > >> >> developers be Cc'd.) > >> > > >> > Eric sent this to the stable list a few times, my mistake for not seeing > >> > he hadn't also cc:ed the developer list. > >> > > >> > Want me to revert it? > >> > > >> > thanks, > >> > > >> > greg k-h > >> > >> My apologies. I'm new to requesting stable patches, but I thought > >> sending to the stable mailing lists would keep the proper folks in the > >> loop. Sorry about that. > >> > >> The bug that the commit fixes has quite a long documentation trail: > >> > >> [BAT execlists] Sporadic - gem_exec_suspend basic-s4 GPU hang after resume > >> https://bugs.freedesktop.org/show_bug.cgi?id=96526 > >> > >> I've had problems with that one and this one that is not fixed in 4.10.x stable: > >> > >> [Regression BDW] kernel panic in Intel i915 module, complete system > >> freeze in 4.10-rc2 > >> https://bugs.freedesktop.org/show_bug.cgi?id=99295 > > > > So, what needs to be done here? > > > > Do I need to revert something in 4.9? Add something? Do something else? > > > > totally confused, > > I did reply to you [1]: > > >> Want me to revert it? > > > > Chris says that would be the correct thing to do. I'm no expert in the > > area, but IIUC having just that commit backported is not enough, > > something more would be needed, but we're not sure yet what exactly and > > if those dependencies can easily be backported. > > "it" being commit f2a0409a0850 ("drm/i915/execlists: Reset RING > registers upon resume") in 4.9.9+. Ah, ok, now reverted, thanks. greg k-h