From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753541AbbCYPsW (ORCPT ); Wed, 25 Mar 2015 11:48:22 -0400 Received: from mail-wi0-f172.google.com ([209.85.212.172]:34237 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752160AbbCYPsU (ORCPT ); Wed, 25 Mar 2015 11:48:20 -0400 Date: Wed, 25 Mar 2015 16:50:03 +0100 From: Daniel Vetter To: Josh Boyer Cc: Daniel Vetter , Dave Airlie , Xi Ruoyao , Linus Torvalds , "Linux-Kernel@Vger. Kernel. Org" , DRI mailing list , Intel Graphics Development Subject: Re: [Intel-gfx] [git pull] drm fixes Message-ID: <20150325155003.GL1349@phenom.ffwll.local> Mail-Followup-To: Josh Boyer , Dave Airlie , Xi Ruoyao , Linus Torvalds , "Linux-Kernel@Vger. Kernel. Org" , DRI mailing list , Intel Graphics Development References: <20150324134011.GJ1349@phenom.ffwll.local> <20150324143439.GK1349@phenom.ffwll.local> <20150325085418.GQ1349@phenom.ffwll.local> <20150325140008.GJ1349@phenom.ffwll.local> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Operating-System: Linux phenom 4.0.0-rc3+ 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 25, 2015 at 11:37:35AM -0400, Josh Boyer wrote: > On Wed, Mar 25, 2015 at 10:00 AM, 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: > > -Daniel > > > > > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > > index 1c12262029fb..bfc14a6046ea 100644 > > --- a/drivers/gpu/drm/i915/intel_display.c > > +++ b/drivers/gpu/drm/i915/intel_display.c > > @@ -2439,6 +2439,7 @@ intel_find_plane_obj(struct intel_crtc *intel_crtc, > > return; > > > > if (intel_alloc_plane_obj(intel_crtc, plane_config)) { > > + intel_crtc->base.primary->state->crtc = &intel_crtc->base; > > update_state_fb(intel_crtc->base.primary); > > return; > > } > > @@ -2469,6 +2470,7 @@ intel_find_plane_obj(struct intel_crtc *intel_crtc, > > > > drm_framebuffer_reference(c->primary->fb); > > intel_crtc->base.primary->fb = c->primary->fb; > > + intel_crtc->base.primary->state->crtc = &intel_crtc->base; > > obj->frontbuffer_bits |= INTEL_FRONTBUFFER_PRIMARY(intel_crtc->pipe); > > break; > > } > > Hm. So I used your patch above. The macbook boots fine and all the > oops/WARNS are gone except the audio one that was unrelated and > present before all of this. > > However, the NUC is back to not booting without HDMI plugged in. I > did the drm.debug=0xff+blacklist/insmod trick again and put the > results up here: > > https://jwboyer.fedorapeople.org/pub/vetters.txt > > The frontbuffer splat is back now. > > I confirmed multiple times that the NUC boots fine with the kernel > that doesn't include the above patch but has the other two included > (albeit with the drm_atomic WARN still). > > Not sure what to make of this one. Yeah that fail looks like we're freeing an fb that's still in use. Hilarity happens and since that happens under console_lock at boot-up your machine dies. Does that machine die the same way in drm-intel-nightly/linux-next? I'll try to figure out meanwhile what's amiss here ... -Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [Intel-gfx] [git pull] drm fixes Date: Wed, 25 Mar 2015 16:50:03 +0100 Message-ID: <20150325155003.GL1349@phenom.ffwll.local> References: <20150324134011.GJ1349@phenom.ffwll.local> <20150324143439.GK1349@phenom.ffwll.local> <20150325085418.GQ1349@phenom.ffwll.local> <20150325140008.GJ1349@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wg0-f54.google.com (mail-wg0-f54.google.com [74.125.82.54]) by gabe.freedesktop.org (Postfix) with ESMTP id 1F0646E263 for ; Wed, 25 Mar 2015 08:48:19 -0700 (PDT) Received: by wgs2 with SMTP id 2so32663415wgs.1 for ; Wed, 25 Mar 2015 08:48:18 -0700 (PDT) Content-Disposition: inline In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Josh Boyer Cc: Intel Graphics Development , "Linux-Kernel@Vger. Kernel. Org" , DRI mailing list , Xi Ruoyao , Linus Torvalds List-Id: dri-devel@lists.freedesktop.org T24gV2VkLCBNYXIgMjUsIDIwMTUgYXQgMTE6Mzc6MzVBTSAtMDQwMCwgSm9zaCBCb3llciB3cm90 ZToKPiBPbiBXZWQsIE1hciAyNSwgMjAxNSBhdCAxMDowMCBBTSwgRGFuaWVsIFZldHRlciA8ZGFu aWVsQGZmd2xsLmNoPiB3cm90ZToKPiA+IE9uIFdlZCwgTWFyIDI1LCAyMDE1IGF0IDA5OjExOjE3 QU0gLTA0MDAsIEpvc2ggQm95ZXIgd3JvdGU6Cj4gPj4gT24gV2VkLCBNYXIgMjUsIDIwMTUgYXQg NDo1NCBBTSwgRGFuaWVsIFZldHRlciA8ZGFuaWVsQGZmd2xsLmNoPiB3cm90ZToKPiA+PiA+PiA+ PiBjb21taXQgZjU1NTQ4YjVhZjg3ZWJmYzU4NmNhNzU3NDg5NDdmMWMxYjFhNGE1Mgo+ID4+ID4+ ID4+IEF1dGhvcjogRGFtaWVuIExlc3BpYXUgPGRhbWllbi5sZXNwaWF1QGludGVsLmNvbT4KPiA+ PiA+PiA+PiBEYXRlOiAgIFRodSBGZWIgNSAxODozMDoyMCAyMDE1ICswMDAwCj4gPj4gPj4gPj4K PiA+PiA+PiA+PiAgICAgZHJtL2k5MTU6IERvbid0IHRyeSB0byByZWZlcmVuY2UgdGhlIGZiIGlu IGdldF9pbml0aWFsX3BsYW5lX2NvbmZpZygpCj4gPj4gPj4gPj4KPiA+PiA+PiA+PiBGcm9tIGxp bnV4LW5leHQ/Cj4gPj4gPj4gPgo+ID4+ID4+ID4gWWVzLCBidWlsZGluZyBub3cuICBXaWxsIGxl dCB5b3Uga25vdyBhcyBzb29uIGFzIEkgdGVzdCBpdCBvbiBib3RoIG1hY2hpbmVzLgo+ID4+ID4+ Cj4gPj4gPj4gT0ssIHdpdGggdGhhdCBjb21taXQgYXBwbGllZCBJIG5vIGxvbmdlciBnZXQgdGhl IGtyZWYuaCBzcGxhdCBhbmQgdGhlCj4gPj4gPj4gTlVDIG1hY2hpbmUgYm9vdHMgaGVhZGxlc3Mu ICBJIHN0aWxsIHNlZSB0aGUgYmFja3RyYWNlIGJlbG93IG9uIGJvdGgKPiA+PiA+PiB0aGUgTlVD IGFuZCB0aGUgbWFjYm9vay4gIEkgaGF2ZSBhIGNvcHkgb2YgaXQgd2l0aCBkcm0uZGVidWc9MHhm ZiBmcm9tCj4gPj4gPj4gdGhlIE5VQyBoZXJlOgo+ID4+ID4+Cj4gPj4gPj4gaHR0cHM6Ly9qd2Jv eWVyLmZlZG9yYXBlb3BsZS5vcmcvcHViL251Yy1kcm0tZGVidWctZmYtd2l0aC1maXhlcy50eHQK PiA+PiA+Pgo+ID4+ID4+IEdldHRpbmcgYmV0dGVyIGF0IGxlYXN0IDopLgo+ID4+ID4KPiA+PiA+ IE9uIHRvcCBvZiB3aGF0IHlvdSBjdXJyZW50bHkgaGF2ZSBwbGVhc2UgYWxzbyBjaGVycnktcGlj awo+ID4+ID4KPiA+PiA+IGNvbW1pdCBmYjk5ODFhYTY3NWViN2IzOTg4NDk5MTUzNjQ5MTZmZDk4 ODMzY2ZhCj4gPj4gPiBBdXRob3I6IERhbWllbiBMZXNwaWF1IDxkYW1pZW4ubGVzcGlhdUBpbnRl bC5jb20+Cj4gPj4gPiBEYXRlOiAgIFRodSBGZWIgNSAxOToyNDoyNSAyMDE1ICswMDAwCj4gPj4g Pgo+ID4+ID4gICAgIGRybS9pOTE1OiBGaXggYXRvbWljIHN0YXRlIHdoZW4gcmV1c2luZyB0aGUg ZmlybXdhcmUgZmIKPiA+PiA+Cj4gPj4gPiBmcm9tIC1uZXh0LiBMZXQncyBob3BlIHRoaXMgdGVy bWluYXRlcyBldmVudHVhbGx5IDstKQo+ID4+Cj4gPj4gSG0uICBUaGF0IG9uZSBkb2Vzbid0IGFw cGx5IGNsZWFubHkuICBJIHRoaW5rIGJlY2F1c2UgaXQgbmVlZHM6Cj4gPj4KPiA+PiBGcm9tIDJk MTQwMzBiMWE5ZDBlODljZmRjYTZmMTY4NTFlMmVhYzhjYjRkZTAgTW9uIFNlcCAxNyAwMDowMDow MCAyMDAxCj4gPj4gRnJvbTogRGFtaWVuIExlc3BpYXUgPGRhbWllbi5sZXNwaWF1QGludGVsLmNv bT4KPiA+PiBEYXRlOiBUaHUsIDUgRmViIDIwMTUgMTc6MjI6MTggKzAwMDAKPiA+PiBTdWJqZWN0 OiBkcm0vaTkxNTogU3RvcmUgdGhlIGluaXRpYWwgZnJhbWVidWZmZXIgaW4gaW5pdGlhbF9wbGFu ZV9jb25maWcKPiA+Pgo+ID4+IGZpcnN0LiAgRG8geW91IHdhbnQgbWUgdG8gZ3JhYiBib3RoLCBv ciBzaG91bGQgSSB0cnkgYW5kIGZpZ3VyZSBvdXQKPiA+PiBob3cgdG8gYmFja3BvcnQgZmI5OTgx YWE2NyB3aXRob3V0IGl0Pwo+ID4KPiA+IE9vcHMgbWlzc2VkIHRoYXQuIFRoZSBhY3RpdmUgaW5n cmVkaWVudCBpcyBzZXR0aW5nIGNydGMtPnByaW1hcnktPnN0YXRlLT5jcnRjIGxpa2UgdGhpczoK PiA+IC1EYW5pZWwKPiA+Cj4gPgo+ID4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+ ID4gaW5kZXggMWMxMjI2MjAyOWZiLi5iZmMxNGE2MDQ2ZWEgMTAwNjQ0Cj4gPiAtLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiA+ICsrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+ID4gQEAgLTI0MzksNiArMjQzOSw3IEBAIGludGVsX2Zp bmRfcGxhbmVfb2JqKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAo+ID4gICAgICAgICAg ICAgICAgIHJldHVybjsKPiA+Cj4gPiAgICAgICAgIGlmIChpbnRlbF9hbGxvY19wbGFuZV9vYmoo aW50ZWxfY3J0YywgcGxhbmVfY29uZmlnKSkgewo+ID4gKyAgICAgICAgICAgICAgIGludGVsX2Ny dGMtPmJhc2UucHJpbWFyeS0+c3RhdGUtPmNydGMgPSAmaW50ZWxfY3J0Yy0+YmFzZTsKPiA+ICAg ICAgICAgICAgICAgICB1cGRhdGVfc3RhdGVfZmIoaW50ZWxfY3J0Yy0+YmFzZS5wcmltYXJ5KTsK PiA+ICAgICAgICAgICAgICAgICByZXR1cm47Cj4gPiAgICAgICAgIH0KPiA+IEBAIC0yNDY5LDYg KzI0NzAsNyBAQCBpbnRlbF9maW5kX3BsYW5lX29iaihzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxf Y3J0YywKPiA+Cj4gPiAgICAgICAgICAgICAgICAgICAgICAgICBkcm1fZnJhbWVidWZmZXJfcmVm ZXJlbmNlKGMtPnByaW1hcnktPmZiKTsKPiA+ICAgICAgICAgICAgICAgICAgICAgICAgIGludGVs X2NydGMtPmJhc2UucHJpbWFyeS0+ZmIgPSBjLT5wcmltYXJ5LT5mYjsKPiA+ICsgICAgICAgICAg ICAgICAgICAgICAgIGludGVsX2NydGMtPmJhc2UucHJpbWFyeS0+c3RhdGUtPmNydGMgPSAmaW50 ZWxfY3J0Yy0+YmFzZTsKPiA+ICAgICAgICAgICAgICAgICAgICAgICAgIG9iai0+ZnJvbnRidWZm ZXJfYml0cyB8PSBJTlRFTF9GUk9OVEJVRkZFUl9QUklNQVJZKGludGVsX2NydGMtPnBpcGUpOwo+ ID4gICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7Cj4gPiAgICAgICAgICAgICAgICAgfQo+ IAo+IEhtLiAgU28gSSB1c2VkIHlvdXIgcGF0Y2ggYWJvdmUuICBUaGUgbWFjYm9vayBib290cyBm aW5lIGFuZCBhbGwgdGhlCj4gb29wcy9XQVJOUyBhcmUgZ29uZSBleGNlcHQgdGhlIGF1ZGlvIG9u ZSB0aGF0IHdhcyB1bnJlbGF0ZWQgYW5kCj4gcHJlc2VudCBiZWZvcmUgYWxsIG9mIHRoaXMuCj4g Cj4gSG93ZXZlciwgdGhlIE5VQyBpcyBiYWNrIHRvIG5vdCBib290aW5nIHdpdGhvdXQgSERNSSBw bHVnZ2VkIGluLiAgSQo+IGRpZCB0aGUgZHJtLmRlYnVnPTB4ZmYrYmxhY2tsaXN0L2luc21vZCB0 cmljayBhZ2FpbiBhbmQgcHV0IHRoZQo+IHJlc3VsdHMgdXAgaGVyZToKPiAKPiBodHRwczovL2p3 Ym95ZXIuZmVkb3JhcGVvcGxlLm9yZy9wdWIvdmV0dGVycy50eHQKPiAKPiBUaGUgZnJvbnRidWZm ZXIgc3BsYXQgaXMgYmFjayBub3cuCj4gCj4gSSBjb25maXJtZWQgbXVsdGlwbGUgdGltZXMgdGhh dCB0aGUgTlVDIGJvb3RzIGZpbmUgd2l0aCB0aGUga2VybmVsCj4gdGhhdCBkb2Vzbid0IGluY2x1 ZGUgdGhlIGFib3ZlIHBhdGNoIGJ1dCBoYXMgdGhlIG90aGVyIHR3byBpbmNsdWRlZAo+IChhbGJl aXQgd2l0aCB0aGUgZHJtX2F0b21pYyBXQVJOIHN0aWxsKS4KPiAKPiBOb3Qgc3VyZSB3aGF0IHRv IG1ha2Ugb2YgdGhpcyBvbmUuCgpZZWFoIHRoYXQgZmFpbCBsb29rcyBsaWtlIHdlJ3JlIGZyZWVp bmcgYW4gZmIgdGhhdCdzIHN0aWxsIGluIHVzZS4KSGlsYXJpdHkgaGFwcGVucyBhbmQgc2luY2Ug dGhhdCBoYXBwZW5zIHVuZGVyIGNvbnNvbGVfbG9jayBhdCBib290LXVwIHlvdXIKbWFjaGluZSBk aWVzLgoKRG9lcyB0aGF0IG1hY2hpbmUgZGllIHRoZSBzYW1lIHdheSBpbiBkcm0taW50ZWwtbmln aHRseS9saW51eC1uZXh0PwoKSSdsbCB0cnkgdG8gZmlndXJlIG91dCBtZWFud2hpbGUgd2hhdCdz IGFtaXNzIGhlcmUgLi4uCi1EYW5pZWwKLS0gCkRhbmllbCBWZXR0ZXIKU29mdHdhcmUgRW5naW5l ZXIsIEludGVsIENvcnBvcmF0aW9uCmh0dHA6Ly9ibG9nLmZmd2xsLmNoCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QK ZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==