From mboxrd@z Thu Jan 1 00:00:00 1970 From: Takashi Iwai Subject: Re: [Intel-gfx] [git pull] drm fixes Date: Wed, 25 Mar 2015 16:26:59 +0100 Message-ID: References: <20150324073219.GV1349@phenom.ffwll.local> <20150324134011.GJ1349@phenom.ffwll.local> <20150324143439.GK1349@phenom.ffwll.local> <20150325085418.GQ1349@phenom.ffwll.local> <20150325140008.GJ1349@phenom.ffwll.local> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20150325140008.GJ1349@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Daniel Vetter Cc: Josh Boyer , Intel Graphics Development , "Linux-Kernel@Vger. Kernel. Org" , DRI mailing list , Xi Ruoyao , Linus Torvalds List-Id: dri-devel@lists.freedesktop.org QXQgV2VkLCAyNSBNYXIgMjAxNSAxNTowMDowOCArMDEwMCwKRGFuaWVsIFZldHRlciB3cm90ZToK PiAKPiBPbiBXZWQsIE1hciAyNSwgMjAxNSBhdCAwOToxMToxN0FNIC0wNDAwLCBKb3NoIEJveWVy IHdyb3RlOgo+ID4gT24gV2VkLCBNYXIgMjUsIDIwMTUgYXQgNDo1NCBBTSwgRGFuaWVsIFZldHRl ciA8ZGFuaWVsQGZmd2xsLmNoPiB3cm90ZToKPiA+ID4+ID4+IGNvbW1pdCBmNTU1NDhiNWFmODdl YmZjNTg2Y2E3NTc0ODk0N2YxYzFiMWE0YTUyCj4gPiA+PiA+PiBBdXRob3I6IERhbWllbiBMZXNw aWF1IDxkYW1pZW4ubGVzcGlhdUBpbnRlbC5jb20+Cj4gPiA+PiA+PiBEYXRlOiAgIFRodSBGZWIg NSAxODozMDoyMCAyMDE1ICswMDAwCj4gPiA+PiA+Pgo+ID4gPj4gPj4gICAgIGRybS9pOTE1OiBE b24ndCB0cnkgdG8gcmVmZXJlbmNlIHRoZSBmYiBpbiBnZXRfaW5pdGlhbF9wbGFuZV9jb25maWco KQo+ID4gPj4gPj4KPiA+ID4+ID4+IEZyb20gbGludXgtbmV4dD8KPiA+ID4+ID4KPiA+ID4+ID4g WWVzLCBidWlsZGluZyBub3cuICBXaWxsIGxldCB5b3Uga25vdyBhcyBzb29uIGFzIEkgdGVzdCBp dCBvbiBib3RoIG1hY2hpbmVzLgo+ID4gPj4KPiA+ID4+IE9LLCB3aXRoIHRoYXQgY29tbWl0IGFw cGxpZWQgSSBubyBsb25nZXIgZ2V0IHRoZSBrcmVmLmggc3BsYXQgYW5kIHRoZQo+ID4gPj4gTlVD IG1hY2hpbmUgYm9vdHMgaGVhZGxlc3MuICBJIHN0aWxsIHNlZSB0aGUgYmFja3RyYWNlIGJlbG93 IG9uIGJvdGgKPiA+ID4+IHRoZSBOVUMgYW5kIHRoZSBtYWNib29rLiAgSSBoYXZlIGEgY29weSBv ZiBpdCB3aXRoIGRybS5kZWJ1Zz0weGZmIGZyb20KPiA+ID4+IHRoZSBOVUMgaGVyZToKPiA+ID4+ Cj4gPiA+PiBodHRwczovL2p3Ym95ZXIuZmVkb3JhcGVvcGxlLm9yZy9wdWIvbnVjLWRybS1kZWJ1 Zy1mZi13aXRoLWZpeGVzLnR4dAo+ID4gPj4KPiA+ID4+IEdldHRpbmcgYmV0dGVyIGF0IGxlYXN0 IDopLgo+ID4gPgo+ID4gPiBPbiB0b3Agb2Ygd2hhdCB5b3UgY3VycmVudGx5IGhhdmUgcGxlYXNl IGFsc28gY2hlcnJ5LXBpY2sKPiA+ID4KPiA+ID4gY29tbWl0IGZiOTk4MWFhNjc1ZWI3YjM5ODg0 OTkxNTM2NDkxNmZkOTg4MzNjZmEKPiA+ID4gQXV0aG9yOiBEYW1pZW4gTGVzcGlhdSA8ZGFtaWVu Lmxlc3BpYXVAaW50ZWwuY29tPgo+ID4gPiBEYXRlOiAgIFRodSBGZWIgNSAxOToyNDoyNSAyMDE1 ICswMDAwCj4gPiA+Cj4gPiA+ICAgICBkcm0vaTkxNTogRml4IGF0b21pYyBzdGF0ZSB3aGVuIHJl dXNpbmcgdGhlIGZpcm13YXJlIGZiCj4gPiA+Cj4gPiA+IGZyb20gLW5leHQuIExldCdzIGhvcGUg dGhpcyB0ZXJtaW5hdGVzIGV2ZW50dWFsbHkgOy0pCj4gPiAKPiA+IEhtLiAgVGhhdCBvbmUgZG9l c24ndCBhcHBseSBjbGVhbmx5LiAgSSB0aGluayBiZWNhdXNlIGl0IG5lZWRzOgo+ID4gCj4gPiBG cm9tIDJkMTQwMzBiMWE5ZDBlODljZmRjYTZmMTY4NTFlMmVhYzhjYjRkZTAgTW9uIFNlcCAxNyAw MDowMDowMCAyMDAxCj4gPiBGcm9tOiBEYW1pZW4gTGVzcGlhdSA8ZGFtaWVuLmxlc3BpYXVAaW50 ZWwuY29tPgo+ID4gRGF0ZTogVGh1LCA1IEZlYiAyMDE1IDE3OjIyOjE4ICswMDAwCj4gPiBTdWJq ZWN0OiBkcm0vaTkxNTogU3RvcmUgdGhlIGluaXRpYWwgZnJhbWVidWZmZXIgaW4gaW5pdGlhbF9w bGFuZV9jb25maWcKPiA+IAo+ID4gZmlyc3QuICBEbyB5b3Ugd2FudCBtZSB0byBncmFiIGJvdGgs IG9yIHNob3VsZCBJIHRyeSBhbmQgZmlndXJlIG91dAo+ID4gaG93IHRvIGJhY2twb3J0IGZiOTk4 MWFhNjcgd2l0aG91dCBpdD8KPiAKPiBPb3BzIG1pc3NlZCB0aGF0LiBUaGUgYWN0aXZlIGluZ3Jl ZGllbnQgaXMgc2V0dGluZyBjcnRjLT5wcmltYXJ5LT5zdGF0ZS0+Y3J0YyBsaWtlIHRoaXM6CgpB cyBJIHdyb3RlIGluIGFub3RoZXIgbWFpbCwgSSBjYW4gY29uZmlybSB0aGF0IGNoZXJyeS1waWNr aW5nIG9mIHRocmVlCmNvbW1pdHMgKGFuZCBtYW51YWwgY29tcGlsZSBmaXhlcykgZml4ZWQgdGhl IHByb2JsZW0gb24gbXkgbWFjaGluZS4KCgpUYWthc2hpCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVs QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753301AbbCYP1F (ORCPT ); Wed, 25 Mar 2015 11:27:05 -0400 Received: from cantor2.suse.de ([195.135.220.15]:35951 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752897AbbCYP1B (ORCPT ); Wed, 25 Mar 2015 11:27:01 -0400 Date: Wed, 25 Mar 2015 16:26:59 +0100 Message-ID: From: Takashi Iwai To: Daniel Vetter Cc: Josh Boyer , Dave Airlie , Intel Graphics Development , "Linux-Kernel@Vger. Kernel. Org" , DRI mailing list , Xi Ruoyao , Linus Torvalds Subject: Re: [Intel-gfx] [git pull] drm fixes In-Reply-To: <20150325140008.GJ1349@phenom.ffwll.local> References: <20150324073219.GV1349@phenom.ffwll.local> <20150324134011.GJ1349@phenom.ffwll.local> <20150324143439.GK1349@phenom.ffwll.local> <20150325085418.GQ1349@phenom.ffwll.local> <20150325140008.GJ1349@phenom.ffwll.local> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/24.4 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org At Wed, 25 Mar 2015 15:00:08 +0100, Daniel Vetter wrote: > > On Wed, Mar 25, 2015 at 09:11:17AM -0400, Josh Boyer wrote: > > On Wed, Mar 25, 2015 at 4:54 AM, Daniel Vetter wrote: > > >> >> commit f55548b5af87ebfc586ca75748947f1c1b1a4a52 > > >> >> Author: Damien Lespiau > > >> >> Date: Thu Feb 5 18:30:20 2015 +0000 > > >> >> > > >> >> drm/i915: Don't try to reference the fb in get_initial_plane_config() > > >> >> > > >> >> From linux-next? > > >> > > > >> > Yes, building now. Will let you know as soon as I test it on both machines. > > >> > > >> OK, with that commit applied I no longer get the kref.h splat and the > > >> NUC machine boots headless. I still see the backtrace below on both > > >> the NUC and the macbook. I have a copy of it with drm.debug=0xff from > > >> the NUC here: > > >> > > >> https://jwboyer.fedorapeople.org/pub/nuc-drm-debug-ff-with-fixes.txt > > >> > > >> Getting better at least :). > > > > > > On top of what you currently have please also cherry-pick > > > > > > commit fb9981aa675eb7b398849915364916fd98833cfa > > > Author: Damien Lespiau > > > Date: Thu Feb 5 19:24:25 2015 +0000 > > > > > > drm/i915: Fix atomic state when reusing the firmware fb > > > > > > from -next. Let's hope this terminates eventually ;-) > > > > Hm. That one doesn't apply cleanly. I think because it needs: > > > > From 2d14030b1a9d0e89cfdca6f16851e2eac8cb4de0 Mon Sep 17 00:00:00 2001 > > From: Damien Lespiau > > Date: Thu, 5 Feb 2015 17:22:18 +0000 > > Subject: drm/i915: Store the initial framebuffer in initial_plane_config > > > > first. Do you want me to grab both, or should I try and figure out > > how to backport fb9981aa67 without it? > > Oops missed that. The active ingredient is setting crtc->primary->state->crtc like this: As I wrote in another mail, I can confirm that cherry-picking of three commits (and manual compile fixes) fixed the problem on my machine. Takashi