From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg KH Subject: Re: drm/i915 4.5/4.6 stable backport request for CHV Date: Wed, 22 Jun 2016 15:26:00 -0700 Message-ID: <20160622222600.GA32198@kroah.com> References: <1464337832-15948-1-git-send-email-ville.syrjala@linux.intel.com> <20160604210658.GA4068@kroah.com> <20160606093216.GD4329@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by gabe.freedesktop.org (Postfix) with ESMTPS id 11B7D88310 for ; Wed, 22 Jun 2016 22:26:01 +0000 (UTC) Content-Disposition: inline In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Daniel Vetter Cc: intel-gfx , stable List-Id: intel-gfx@lists.freedesktop.org T24gV2VkLCBKdW4gMjIsIDIwMTYgYXQgMDM6NTU6MDNQTSArMDIwMCwgRGFuaWVsIFZldHRlciB3 cm90ZToKPiBPbiBNb24sIEp1biA2LCAyMDE2IGF0IDExOjMyIEFNLCBWaWxsZSBTeXJqw6Rsw6QK PiA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+IHdyb3RlOgo+ID4gT24gU2F0LCBKdW4g MDQsIDIwMTYgYXQgMDI6MDY6NThQTSAtMDcwMCwgR3JlZyBLSCB3cm90ZToKPiA+PiBPbiBGcmks IE1heSAyNywgMjAxNiBhdCAxMTozMDozMEFNICswMzAwLCB2aWxsZS5zeXJqYWxhQGxpbnV4Lmlu dGVsLmNvbSB3cm90ZToKPiA+PiA+IEZyb206IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFs YUBsaW51eC5pbnRlbC5jb20+Cj4gPj4gPgo+ID4+ID4gU2V2ZXJhbCBuYXN0eSBpOTE1IHJlZ3Jl c3Npb25zIGFmZmVjdGluZyBDSFYgc2xpcHBlZCB0aHJvdWdoCj4gPj4gPiB0byA0LjUgYW5kIDQu Ni4KPiA+PiA+Cj4gPj4gPiBUaGUgZmlyc3QgZml4IHdlIHdhbnQgaW4gNC41IGFuZCA0LjYgaXMK PiA+PiA+IGNvbW1pdCBjYWVkMzYxZDgzYjIgKCJkcm0vaTkxNTogRml4IHdhdGVybWFya3MgZm9y IFZMVi9DSFYiKQo+ID4+ID4gSXQgd29uJ3QgY2hlcnJ5LXBpY2sgY2xlYW5seSB0byBlaXRoZXIg b25lLCBzbyBJJ3ZlIGluY2x1ZGVkIGNvbmZsaWN0Cj4gPj4gPiBmcmVlIHZlcnNpb25zIGZvciBi b3RoLiBUaGlzIG9uZSBmaXhlcyBkaXNwbGF5IEZJRk8gdW5kZXJydW5zIHRoYXQgY2FuCj4gPj4g PiBsZWFkIHRvIHRoZSBzY3JlZW4gdG90YWxseSBibGFua2luZyBvdXQuCj4gPj4KPiA+PiBOb3cg YXBwbGllZCwgdGhhbmtzLgo+ID4+Cj4gPj4gPiBUaGUgb3RoZXIgb25lIEknZCBsaWtlIHRvIGhh dmUgaW4gNC42IGlzCj4gPj4gPiBjb21taXQgOWY2MTUxYzkwMzkwICgiZHJtL2k5MTU6IFBhc3Mg dGhlIGNvcnJlY3QgY3J0YyBzdGF0ZSB0byAudXBkYXRlX3BsYW5lKCkiKQo+ID4+ID4gd2hpY2gg YXZvaWRzIGEgdG90YWxseSBjb3JydXB0ZWQgZGlzcGxheSBpbiBzb21lIGNhc2VzLgo+ID4+Cj4g Pj4gTm93IGFwcGxpZWQuCj4gPj4KPiA+PiA+IEFuZCB0aGUgdGhpcmQgb24gaXMgYSBiaXQgbW9y ZSBhbm5veWluZy4gVGhlIHJlZ3Jlc3Npb24gaXMgY2F1c2VkIGJ5Cj4gPj4gPiBjb21taXQgOWRi YWFiNTZhYzA5ICgiZHJtL2k5MTU6IEV4aXQgY2hlcnJ5dmlld19pcnFfaGFuZGxlcigpIGFmdGVy IG9uZSBwYXNzIikKPiA+PiA+IHdoaWNoIEkgdGhvdWdoIHdlIGhhZCBwcmV2ZW50ZWQgZnJvbSBn ZXR0aW5nIG91dCBvbiBpdHMgb3duLCBidXQgdHVybnMKPiA+PiA+IG91dCBJIHdhcyB3cm9uZy4g SXQgYmFzaWNhbGx5IG1ha2VzIHRoZSBHUFUgdW51c2FibGUsIHNvIHdlIGRvIG5lZWQgdG8KPiA+ PiA+IGZpeCBpdCBzb21laG93LiBUaGUgc2ltcGxlIHNvbHV0aW9uIHdvdWxkIGJlIHRvIHJldmVy dCBpdCBpbiA0LjYgb25seS4KPiA+PiA+IFRoZSBtb3JlIGNvbXBsaWNhdGVkIHNvbHV0aW9uIGlz IHRvIGJhY2twb3J0IHRoZSBwcm9wZXIgZml4LCB3aGljaCBtb3JlCj4gPj4gPiBvciBsZXNzIHJl cXVpcmVzIHRoZSBmb2xsb3dpbmcgc2V0IG9mIGNvbW1pdHMgWzFdLCB3aGljaCBpcyBtYXliZSBh IGJpdAo+ID4+ID4gdG9vIG11Y2ggZm9yIHN0YWJsZS4gSSBjb3VsZCB0cnkgdG8gdHJpbSBpdCBh IGJpdCBwZXJoYXBzLCBidXQgdGhlbiB3ZQo+ID4+ID4gc3RhcnQgdG8gZW50ZXIgdGhlIHRlcnJp dG9yeSBvZiB1bnRlc3RlZCBjb2RlIHdoaWNoIEkgZG9uJ3QgcGFydGljdWxhcmx5Cj4gPj4gPiBs aWtlLiBMZXQgbWUga25vdyB3aGF0IHlvdSB0aGluay4KPiA+PiA+Cj4gPj4gPiBbMV0KPiA+PiA+ ICAxZTFjYWNlOTQyZWYgKCJkcm0vaTkxNTogRWxpbWluYXRlIGxvb3AgZnJvbSBWTFYgaXJxIGhh bmRsZXIiKQo+ID4+ID4gIGE1ZTQ4NWE5NWM5YyAoImRybS9pOTE1OiBDbGVhciBWTFZfSUVSIGFy b3VuZCBpcnEgcHJvY2Vzc2luZyIpCj4gPj4gPiAgNGEwYTAyMDJiMDIzICgiZHJtL2k5MTU6IENs ZWFyIFZMVl9NQVNURVJfSUVSIGFyb3VuZCBpcnEgcHJvY2Vzc2luZyIpCj4gPj4gPiAgN2NlNGQx ZjI3MzBmICgiZHJtL2k5MTU6IENsZWFyIFZMVl9JSVIgYWZ0ZXIgUElQRVNUQVQiKQo+ID4+ID4g IDM0YzdiOGE3YjhiNSAoImRybS9pOTE1OiBTZXQgdXAgVkxWX01BU1RFUl9JRVIgY29uc2lzdGVu dGx5IikKPiA+PiA+ICBlNTMyOGM0M2Q0NmUgKCJkcm0vaTkxNTogVXNlIEdFTjhfTUFTVEVSX0lS UV9DT05UUk9MIGNvbnNpc3RlbnRseSIpCj4gPj4gPiAgNzFiOGI0MWQ1YjM1ICgiZHJtL2k5MTU6 IE1vdmUgRFBJTlZHVFQgc2V0dXAgdG8gdmx2X2Rpc3BsYXlfaXJxX3Jlc2V0KCkiKQo+ID4+ID4g IDZiN2VhZmMxYjQzZCAoImRybS9pOTE1OiBXYXJuIGlmIGlycV9tYXNrIGlzbid0IH4wIGR1cmlu ZyB2bHYvY3ZoIGRpc3BsYXkgaXJxIHBvc3RpbnN0YWxsIikKPiA+PiA+ICA5YWI5ODFmMjJiZWYg KCJkcm0vaTkxNTogVXNlIEdFTjVfSVJRX0lOSVQoKSBpbiB2bHZfZGlzcGxheV9pcnFfcG9zdGlu c3RhbGwoKSIpCj4gPj4gPiAgZDZjNjk4MDM1ODkyICgiZHJtL2k5MTU6IENsZWFyIGRpc3BsYXkg aW50ZXJydXB0IGJlZm9yZSBlbmFibGluZyB3aGVuIHR1cm5pbmcgb24gdGhlIHBvd2VyIHdlbGwi KQo+ID4+ID4gIDhiYjYxMzA2OGE2MyAoImRybS9pOTE1OiBNb3ZlIHZsdi9jaHYgZGlzcGxheSBp cnEgY29kZSB0byBhIG1vcmUgbG9naWNhbCBwbGFjZSIpCj4gPj4gPiAgOTkxODI3MWVmYzdhICgi ZHJtL2k5MTU6IFNraXAgZGlzcGxheSBpcnEgc2V0dXAgaWYgZGlzcGxheSBpcnFzIGFyZW4ndCBm bGFnZ2VkIGFzIGVuYWJsZWQiKQo+ID4+ID4gIGFkMjJkMTA2NTRlYSAoImRybS9pOTE1OiBGaXgg dXAgdmx2L2NodiBkaXNwbGF5IGlycSBzZXR1cCIpCj4gPj4gPiAgOTNkZTY4Zjk0MDgxICgiZHJt L2k5MTU6IFJlbW92ZSAiVkxWIG1hZ2ljIiBmcm9tIGlycSBzZXR1cCIpCj4gPj4KPiA+PiBJIHRo aW5rIHJldmVydGluZyB0aGF0IG9uZSBwYXRjaCBmb3IgNC42IG1ha2VzIG1vcmUgc2Vuc2UgdGhh biBhZGRpbmcKPiA+PiBhbGwgb2YgdGhlc2UgcGF0Y2hlcy4gIEknbGwgZG8gdGhhdCBpZiB5b3Ug d2FudCBtZSB0by4KPiA+Cj4gPiBUaGF0IHdvcmtzIGZvciBtZS4gVGhhbmtzLgo+IAo+IEhhcyB0 aGlzIGhhcHBlbmVkPyBJIGp1c3QgZ290IGEgcGluZyBvbiBpcmMgdGhhdCBicmFzd2VsbCBpbiA0 LjYgaXMKPiBzdGlsbCBlbnRpcmVseSB0b2FzdGVkIDooCgpTb3JyeSBmb3IgdGhlIGRlbGF5LCBy ZXZlcnQgaXMgbm93IHF1ZXVlZCB1cC4KCmdyZWcgay1oCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2ludGVsLWdmeAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out3-smtp.messagingengine.com ([66.111.4.27]:50394 "EHLO out3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750916AbcFVW0C (ORCPT ); Wed, 22 Jun 2016 18:26:02 -0400 Date: Wed, 22 Jun 2016 15:26:00 -0700 From: Greg KH To: Daniel Vetter Cc: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= , intel-gfx , stable Subject: Re: [Intel-gfx] drm/i915 4.5/4.6 stable backport request for CHV Message-ID: <20160622222600.GA32198@kroah.com> References: <1464337832-15948-1-git-send-email-ville.syrjala@linux.intel.com> <20160604210658.GA4068@kroah.com> <20160606093216.GD4329@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Sender: stable-owner@vger.kernel.org List-ID: On Wed, Jun 22, 2016 at 03:55:03PM +0200, Daniel Vetter wrote: > On Mon, Jun 6, 2016 at 11:32 AM, Ville Syrj�l� > wrote: > > On Sat, Jun 04, 2016 at 02:06:58PM -0700, Greg KH wrote: > >> On Fri, May 27, 2016 at 11:30:30AM +0300, ville.syrjala@linux.intel.com wrote: > >> > From: Ville Syrj�l� > >> > > >> > Several nasty i915 regressions affecting CHV slipped through > >> > to 4.5 and 4.6. > >> > > >> > The first fix we want in 4.5 and 4.6 is > >> > commit caed361d83b2 ("drm/i915: Fix watermarks for VLV/CHV") > >> > It won't cherry-pick cleanly to either one, so I've included conflict > >> > free versions for both. This one fixes display FIFO underruns that can > >> > lead to the screen totally blanking out. > >> > >> Now applied, thanks. > >> > >> > The other one I'd like to have in 4.6 is > >> > commit 9f6151c90390 ("drm/i915: Pass the correct crtc state to .update_plane()") > >> > which avoids a totally corrupted display in some cases. > >> > >> Now applied. > >> > >> > And the third on is a bit more annoying. The regression is caused by > >> > commit 9dbaab56ac09 ("drm/i915: Exit cherryview_irq_handler() after one pass") > >> > which I though we had prevented from getting out on its own, but turns > >> > out I was wrong. It basically makes the GPU unusable, so we do need to > >> > fix it somehow. The simple solution would be to revert it in 4.6 only. > >> > The more complicated solution is to backport the proper fix, which more > >> > or less requires the following set of commits [1], which is maybe a bit > >> > too much for stable. I could try to trim it a bit perhaps, but then we > >> > start to enter the territory of untested code which I don't particularly > >> > like. Let me know what you think. > >> > > >> > [1] > >> > 1e1cace942ef ("drm/i915: Eliminate loop from VLV irq handler") > >> > a5e485a95c9c ("drm/i915: Clear VLV_IER around irq processing") > >> > 4a0a0202b023 ("drm/i915: Clear VLV_MASTER_IER around irq processing") > >> > 7ce4d1f2730f ("drm/i915: Clear VLV_IIR after PIPESTAT") > >> > 34c7b8a7b8b5 ("drm/i915: Set up VLV_MASTER_IER consistently") > >> > e5328c43d46e ("drm/i915: Use GEN8_MASTER_IRQ_CONTROL consistently") > >> > 71b8b41d5b35 ("drm/i915: Move DPINVGTT setup to vlv_display_irq_reset()") > >> > 6b7eafc1b43d ("drm/i915: Warn if irq_mask isn't ~0 during vlv/cvh display irq postinstall") > >> > 9ab981f22bef ("drm/i915: Use GEN5_IRQ_INIT() in vlv_display_irq_postinstall()") > >> > d6c698035892 ("drm/i915: Clear display interrupt before enabling when turning on the power well") > >> > 8bb613068a63 ("drm/i915: Move vlv/chv display irq code to a more logical place") > >> > 9918271efc7a ("drm/i915: Skip display irq setup if display irqs aren't flagged as enabled") > >> > ad22d10654ea ("drm/i915: Fix up vlv/chv display irq setup") > >> > 93de68f94081 ("drm/i915: Remove "VLV magic" from irq setup") > >> > >> I think reverting that one patch for 4.6 makes more sense than adding > >> all of these patches. I'll do that if you want me to. > > > > That works for me. Thanks. > > Has this happened? I just got a ping on irc that braswell in 4.6 is > still entirely toasted :( Sorry for the delay, revert is now queued up. greg k-h