From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932452AbbCYQms (ORCPT ); Wed, 25 Mar 2015 12:42:48 -0400 Received: from mail-ob0-f180.google.com ([209.85.214.180]:33441 "EHLO mail-ob0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753019AbbCYQmr (ORCPT ); Wed, 25 Mar 2015 12:42:47 -0400 MIME-Version: 1.0 In-Reply-To: References: <20150324134011.GJ1349@phenom.ffwll.local> <20150324143439.GK1349@phenom.ffwll.local> <20150325085418.GQ1349@phenom.ffwll.local> <20150325140008.GJ1349@phenom.ffwll.local> <20150325155003.GL1349@phenom.ffwll.local> Date: Wed, 25 Mar 2015 12:42:46 -0400 X-Google-Sender-Auth: 9zNBHFdftRLs-TWBpcTolcic4lk Message-ID: Subject: Re: [Intel-gfx] [git pull] drm fixes From: Josh Boyer To: Daniel Vetter Cc: Dave Airlie , Xi Ruoyao , Linus Torvalds , "Linux-Kernel@Vger. Kernel. Org" , DRI mailing list , Intel Graphics Development Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Mar 25, 2015 at 11:53 AM, Josh Boyer wrote: > On Wed, Mar 25, 2015 at 11:50 AM, Daniel Vetter wrote: >> 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 that a bit later today. Out of sheer curiosity, I folded > commit5ba76c41e55c (drm/i915: Put update_state_fb() next to the fb > update) into the patch above and kicked off a build. The theory is > that we're picking up a bunch of other changes right in that range of > commits, why not try one more. I'll let you know if that fixes > anything. Otherwise, I'll try building drm-intel-nightly and/or > linux-next after that. The drm-intel-nightly build finished first. It boots without HDMI plugged in, but it has pretty much the same splats as the previous kernel. Confused. Full log here: https://jwboyer.fedorapeople.org/pub/intel-nightly.txt I don't have much hope for my other build. josh From mboxrd@z Thu Jan 1 00:00:00 1970 From: Josh Boyer Subject: Re: [git pull] drm fixes Date: Wed, 25 Mar 2015 12:42:46 -0400 Message-ID: References: <20150324134011.GJ1349@phenom.ffwll.local> <20150324143439.GK1349@phenom.ffwll.local> <20150325085418.GQ1349@phenom.ffwll.local> <20150325140008.GJ1349@phenom.ffwll.local> <20150325155003.GL1349@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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: Dave Airlie , Intel Graphics Development , "Linux-Kernel@Vger. Kernel. Org" , DRI mailing list , Xi Ruoyao , Linus Torvalds List-Id: dri-devel@lists.freedesktop.org T24gV2VkLCBNYXIgMjUsIDIwMTUgYXQgMTE6NTMgQU0sIEpvc2ggQm95ZXIgPGp3Ym95ZXJAZmVk b3JhcHJvamVjdC5vcmc+IHdyb3RlOgo+IE9uIFdlZCwgTWFyIDI1LCAyMDE1IGF0IDExOjUwIEFN LCBEYW5pZWwgVmV0dGVyIDxkYW5pZWxAZmZ3bGwuY2g+IHdyb3RlOgo+PiBPbiBXZWQsIE1hciAy NSwgMjAxNSBhdCAxMTozNzozNUFNIC0wNDAwLCBKb3NoIEJveWVyIHdyb3RlOgo+Pj4gT24gV2Vk LCBNYXIgMjUsIDIwMTUgYXQgMTA6MDAgQU0sIERhbmllbCBWZXR0ZXIgPGRhbmllbEBmZndsbC5j aD4gd3JvdGU6Cj4+PiA+IE9uIFdlZCwgTWFyIDI1LCAyMDE1IGF0IDA5OjExOjE3QU0gLTA0MDAs IEpvc2ggQm95ZXIgd3JvdGU6Cj4+PiA+PiBPbiBXZWQsIE1hciAyNSwgMjAxNSBhdCA0OjU0IEFN LCBEYW5pZWwgVmV0dGVyIDxkYW5pZWxAZmZ3bGwuY2g+IHdyb3RlOgo+Pj4gPj4gPj4gPj4gY29t bWl0IGY1NTU0OGI1YWY4N2ViZmM1ODZjYTc1NzQ4OTQ3ZjFjMWIxYTRhNTIKPj4+ID4+ID4+ID4+ IEF1dGhvcjogRGFtaWVuIExlc3BpYXUgPGRhbWllbi5sZXNwaWF1QGludGVsLmNvbT4KPj4+ID4+ ID4+ID4+IERhdGU6ICAgVGh1IEZlYiA1IDE4OjMwOjIwIDIwMTUgKzAwMDAKPj4+ID4+ID4+ID4+ Cj4+PiA+PiA+PiA+PiAgICAgZHJtL2k5MTU6IERvbid0IHRyeSB0byByZWZlcmVuY2UgdGhlIGZi IGluIGdldF9pbml0aWFsX3BsYW5lX2NvbmZpZygpCj4+PiA+PiA+PiA+Pgo+Pj4gPj4gPj4gPj4g RnJvbSBsaW51eC1uZXh0Pwo+Pj4gPj4gPj4gPgo+Pj4gPj4gPj4gPiBZZXMsIGJ1aWxkaW5nIG5v dy4gIFdpbGwgbGV0IHlvdSBrbm93IGFzIHNvb24gYXMgSSB0ZXN0IGl0IG9uIGJvdGggbWFjaGlu ZXMuCj4+PiA+PiA+Pgo+Pj4gPj4gPj4gT0ssIHdpdGggdGhhdCBjb21taXQgYXBwbGllZCBJIG5v IGxvbmdlciBnZXQgdGhlIGtyZWYuaCBzcGxhdCBhbmQgdGhlCj4+PiA+PiA+PiBOVUMgbWFjaGlu ZSBib290cyBoZWFkbGVzcy4gIEkgc3RpbGwgc2VlIHRoZSBiYWNrdHJhY2UgYmVsb3cgb24gYm90 aAo+Pj4gPj4gPj4gdGhlIE5VQyBhbmQgdGhlIG1hY2Jvb2suICBJIGhhdmUgYSBjb3B5IG9mIGl0 IHdpdGggZHJtLmRlYnVnPTB4ZmYgZnJvbQo+Pj4gPj4gPj4gdGhlIE5VQyBoZXJlOgo+Pj4gPj4g Pj4KPj4+ID4+ID4+IGh0dHBzOi8vandib3llci5mZWRvcmFwZW9wbGUub3JnL3B1Yi9udWMtZHJt LWRlYnVnLWZmLXdpdGgtZml4ZXMudHh0Cj4+PiA+PiA+Pgo+Pj4gPj4gPj4gR2V0dGluZyBiZXR0 ZXIgYXQgbGVhc3QgOikuCj4+PiA+PiA+Cj4+PiA+PiA+IE9uIHRvcCBvZiB3aGF0IHlvdSBjdXJy ZW50bHkgaGF2ZSBwbGVhc2UgYWxzbyBjaGVycnktcGljawo+Pj4gPj4gPgo+Pj4gPj4gPiBjb21t aXQgZmI5OTgxYWE2NzVlYjdiMzk4ODQ5OTE1MzY0OTE2ZmQ5ODgzM2NmYQo+Pj4gPj4gPiBBdXRo b3I6IERhbWllbiBMZXNwaWF1IDxkYW1pZW4ubGVzcGlhdUBpbnRlbC5jb20+Cj4+PiA+PiA+IERh dGU6ICAgVGh1IEZlYiA1IDE5OjI0OjI1IDIwMTUgKzAwMDAKPj4+ID4+ID4KPj4+ID4+ID4gICAg IGRybS9pOTE1OiBGaXggYXRvbWljIHN0YXRlIHdoZW4gcmV1c2luZyB0aGUgZmlybXdhcmUgZmIK Pj4+ID4+ID4KPj4+ID4+ID4gZnJvbSAtbmV4dC4gTGV0J3MgaG9wZSB0aGlzIHRlcm1pbmF0ZXMg ZXZlbnR1YWxseSA7LSkKPj4+ID4+Cj4+PiA+PiBIbS4gIFRoYXQgb25lIGRvZXNuJ3QgYXBwbHkg Y2xlYW5seS4gIEkgdGhpbmsgYmVjYXVzZSBpdCBuZWVkczoKPj4+ID4+Cj4+PiA+PiBGcm9tIDJk MTQwMzBiMWE5ZDBlODljZmRjYTZmMTY4NTFlMmVhYzhjYjRkZTAgTW9uIFNlcCAxNyAwMDowMDow MCAyMDAxCj4+PiA+PiBGcm9tOiBEYW1pZW4gTGVzcGlhdSA8ZGFtaWVuLmxlc3BpYXVAaW50ZWwu Y29tPgo+Pj4gPj4gRGF0ZTogVGh1LCA1IEZlYiAyMDE1IDE3OjIyOjE4ICswMDAwCj4+PiA+PiBT dWJqZWN0OiBkcm0vaTkxNTogU3RvcmUgdGhlIGluaXRpYWwgZnJhbWVidWZmZXIgaW4gaW5pdGlh bF9wbGFuZV9jb25maWcKPj4+ID4+Cj4+PiA+PiBmaXJzdC4gIERvIHlvdSB3YW50IG1lIHRvIGdy YWIgYm90aCwgb3Igc2hvdWxkIEkgdHJ5IGFuZCBmaWd1cmUgb3V0Cj4+PiA+PiBob3cgdG8gYmFj a3BvcnQgZmI5OTgxYWE2NyB3aXRob3V0IGl0Pwo+Pj4gPgo+Pj4gPiBPb3BzIG1pc3NlZCB0aGF0 LiBUaGUgYWN0aXZlIGluZ3JlZGllbnQgaXMgc2V0dGluZyBjcnRjLT5wcmltYXJ5LT5zdGF0ZS0+ Y3J0YyBsaWtlIHRoaXM6Cj4+PiA+IC1EYW5pZWwKPj4+ID4KPj4+ID4KPj4+ID4gZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+Pj4gPiBpbmRleCAxYzEyMjYyMDI5ZmIuLmJmYzE0YTYw NDZlYSAxMDA2NDQKPj4+ID4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jCj4+PiA+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+Pj4g PiBAQCAtMjQzOSw2ICsyNDM5LDcgQEAgaW50ZWxfZmluZF9wbGFuZV9vYmooc3RydWN0IGludGVs X2NydGMgKmludGVsX2NydGMsCj4+PiA+ICAgICAgICAgICAgICAgICByZXR1cm47Cj4+PiA+Cj4+ PiA+ICAgICAgICAgaWYgKGludGVsX2FsbG9jX3BsYW5lX29iaihpbnRlbF9jcnRjLCBwbGFuZV9j b25maWcpKSB7Cj4+PiA+ICsgICAgICAgICAgICAgICBpbnRlbF9jcnRjLT5iYXNlLnByaW1hcnkt PnN0YXRlLT5jcnRjID0gJmludGVsX2NydGMtPmJhc2U7Cj4+PiA+ICAgICAgICAgICAgICAgICB1 cGRhdGVfc3RhdGVfZmIoaW50ZWxfY3J0Yy0+YmFzZS5wcmltYXJ5KTsKPj4+ID4gICAgICAgICAg ICAgICAgIHJldHVybjsKPj4+ID4gICAgICAgICB9Cj4+PiA+IEBAIC0yNDY5LDYgKzI0NzAsNyBA QCBpbnRlbF9maW5kX3BsYW5lX29iaihzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YywKPj4+ ID4KPj4+ID4gICAgICAgICAgICAgICAgICAgICAgICAgZHJtX2ZyYW1lYnVmZmVyX3JlZmVyZW5j ZShjLT5wcmltYXJ5LT5mYik7Cj4+PiA+ICAgICAgICAgICAgICAgICAgICAgICAgIGludGVsX2Ny dGMtPmJhc2UucHJpbWFyeS0+ZmIgPSBjLT5wcmltYXJ5LT5mYjsKPj4+ID4gKyAgICAgICAgICAg ICAgICAgICAgICAgaW50ZWxfY3J0Yy0+YmFzZS5wcmltYXJ5LT5zdGF0ZS0+Y3J0YyA9ICZpbnRl bF9jcnRjLT5iYXNlOwo+Pj4gPiAgICAgICAgICAgICAgICAgICAgICAgICBvYmotPmZyb250YnVm ZmVyX2JpdHMgfD0gSU5URUxfRlJPTlRCVUZGRVJfUFJJTUFSWShpbnRlbF9jcnRjLT5waXBlKTsK Pj4+ID4gICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7Cj4+PiA+ICAgICAgICAgICAgICAg ICB9Cj4+Pgo+Pj4gSG0uICBTbyBJIHVzZWQgeW91ciBwYXRjaCBhYm92ZS4gIFRoZSBtYWNib29r IGJvb3RzIGZpbmUgYW5kIGFsbCB0aGUKPj4+IG9vcHMvV0FSTlMgYXJlIGdvbmUgZXhjZXB0IHRo ZSBhdWRpbyBvbmUgdGhhdCB3YXMgdW5yZWxhdGVkIGFuZAo+Pj4gcHJlc2VudCBiZWZvcmUgYWxs IG9mIHRoaXMuCj4+Pgo+Pj4gSG93ZXZlciwgdGhlIE5VQyBpcyBiYWNrIHRvIG5vdCBib290aW5n IHdpdGhvdXQgSERNSSBwbHVnZ2VkIGluLiAgSQo+Pj4gZGlkIHRoZSBkcm0uZGVidWc9MHhmZiti bGFja2xpc3QvaW5zbW9kIHRyaWNrIGFnYWluIGFuZCBwdXQgdGhlCj4+PiByZXN1bHRzIHVwIGhl cmU6Cj4+Pgo+Pj4gaHR0cHM6Ly9qd2JveWVyLmZlZG9yYXBlb3BsZS5vcmcvcHViL3ZldHRlcnMu dHh0Cj4+Pgo+Pj4gVGhlIGZyb250YnVmZmVyIHNwbGF0IGlzIGJhY2sgbm93Lgo+Pj4KPj4+IEkg Y29uZmlybWVkIG11bHRpcGxlIHRpbWVzIHRoYXQgdGhlIE5VQyBib290cyBmaW5lIHdpdGggdGhl IGtlcm5lbAo+Pj4gdGhhdCBkb2Vzbid0IGluY2x1ZGUgdGhlIGFib3ZlIHBhdGNoIGJ1dCBoYXMg dGhlIG90aGVyIHR3byBpbmNsdWRlZAo+Pj4gKGFsYmVpdCB3aXRoIHRoZSBkcm1fYXRvbWljIFdB Uk4gc3RpbGwpLgo+Pj4KPj4+IE5vdCBzdXJlIHdoYXQgdG8gbWFrZSBvZiB0aGlzIG9uZS4KPj4K Pj4gWWVhaCB0aGF0IGZhaWwgbG9va3MgbGlrZSB3ZSdyZSBmcmVlaW5nIGFuIGZiIHRoYXQncyBz dGlsbCBpbiB1c2UuCj4+IEhpbGFyaXR5IGhhcHBlbnMgYW5kIHNpbmNlIHRoYXQgaGFwcGVucyB1 bmRlciBjb25zb2xlX2xvY2sgYXQgYm9vdC11cCB5b3VyCj4+IG1hY2hpbmUgZGllcy4KPj4KPj4g RG9lcyB0aGF0IG1hY2hpbmUgZGllIHRoZSBzYW1lIHdheSBpbiBkcm0taW50ZWwtbmlnaHRseS9s aW51eC1uZXh0Pwo+Cj4gSSdsbCB0cnkgdGhhdCBhIGJpdCBsYXRlciB0b2RheS4gIE91dCBvZiBz aGVlciBjdXJpb3NpdHksIEkgZm9sZGVkCj4gY29tbWl0NWJhNzZjNDFlNTVjIChkcm0vaTkxNTog UHV0IHVwZGF0ZV9zdGF0ZV9mYigpIG5leHQgdG8gdGhlIGZiCj4gdXBkYXRlKSBpbnRvIHRoZSBw YXRjaCBhYm92ZSBhbmQga2lja2VkIG9mZiBhIGJ1aWxkLiAgVGhlIHRoZW9yeSBpcwo+IHRoYXQg d2UncmUgcGlja2luZyB1cCBhIGJ1bmNoIG9mIG90aGVyIGNoYW5nZXMgcmlnaHQgaW4gdGhhdCBy YW5nZSBvZgo+IGNvbW1pdHMsIHdoeSBub3QgdHJ5IG9uZSBtb3JlLiAgSSdsbCBsZXQgeW91IGtu b3cgaWYgdGhhdCBmaXhlcwo+IGFueXRoaW5nLiAgT3RoZXJ3aXNlLCBJJ2xsIHRyeSBidWlsZGlu ZyBkcm0taW50ZWwtbmlnaHRseSBhbmQvb3IKPiBsaW51eC1uZXh0IGFmdGVyIHRoYXQuCgpUaGUg ZHJtLWludGVsLW5pZ2h0bHkgYnVpbGQgZmluaXNoZWQgZmlyc3QuICBJdCBib290cyB3aXRob3V0 IEhETUkKcGx1Z2dlZCBpbiwgYnV0IGl0IGhhcyBwcmV0dHkgbXVjaCB0aGUgc2FtZSBzcGxhdHMg YXMgdGhlIHByZXZpb3VzCmtlcm5lbC4gIENvbmZ1c2VkLiAgRnVsbCBsb2cgaGVyZToKCmh0dHBz Oi8vandib3llci5mZWRvcmFwZW9wbGUub3JnL3B1Yi9pbnRlbC1uaWdodGx5LnR4dAoKSSBkb24n dCBoYXZlIG11Y2ggaG9wZSBmb3IgbXkgb3RoZXIgYnVpbGQuCgpqb3NoCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QK SW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==