From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755568AbbCYO5F (ORCPT ); Wed, 25 Mar 2015 10:57:05 -0400 Received: from blu004-omc3s35.hotmail.com ([65.55.116.110]:60102 "EHLO BLU004-OMC3S35.hotmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751531AbbCYO5B (ORCPT ); Wed, 25 Mar 2015 10:57:01 -0400 X-TMN: [jxZmwa02GCkJVAAptg8wSrMRqzccj45W] X-Originating-Email: [xry111@outlook.com] Message-ID: Date: Wed, 25 Mar 2015 22:56:45 +0800 From: Xi Ruoyao User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: Josh Boyer , Dave Airlie , Stephen Rothwell CC: Linus Torvalds , "Linux-Kernel@Vger. Kernel. Org" , DRI mailing list , Intel Graphics Development Subject: Re: [Intel-gfx] [git pull] drm fixes 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> In-Reply-To: <20150325140008.GJ1349@phenom.ffwll.local> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 25 Mar 2015 14:57:00.0173 (UTC) FILETIME=[F2556BD0:01D0670B] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 03/25/2015 at 10:00 PM, 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; > } I found a bad thing. My buggy code also affects linux-next now because of the manual merge on 2014-03-16. So, Daniel and Stephen please check it and end this mess... It's annoying to see my code caused so much trouble. I didn't test my code with a HDMI device or I should've found this trouble before commiting. I apologize for that again. -- Xi Ruoyao School of Aerospace Science and Technology Xidian University, Xi'an, China From mboxrd@z Thu Jan 1 00:00:00 1970 From: Xi Ruoyao Subject: Re: [git pull] drm fixes Date: Wed, 25 Mar 2015 22:56:45 +0800 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 Content-Type: text/plain; charset="utf-8"; Format="flowed" 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: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Josh Boyer , Dave Airlie , Stephen Rothwell Cc: Intel Graphics Development , Linus Torvalds , "Linux-Kernel@Vger. Kernel. Org" , DRI mailing list List-Id: dri-devel@lists.freedesktop.org CgpPbiAwMy8yNS8yMDE1IGF0IDEwOjAwIFBNLCBEYW5pZWwgVmV0dGVyIHdyb3RlOgo+IE9uIFdl ZCwgTWFyIDI1LCAyMDE1IGF0IDA5OjExOjE3QU0gLTA0MDAsIEpvc2ggQm95ZXIgd3JvdGU6Cj4+ IE9uIFdlZCwgTWFyIDI1LCAyMDE1IGF0IDQ6NTQgQU0sIERhbmllbCBWZXR0ZXIgPGRhbmllbEBm ZndsbC5jaD4gd3JvdGU6Cj4+Pj4+PiBjb21taXQgZjU1NTQ4YjVhZjg3ZWJmYzU4NmNhNzU3NDg5 NDdmMWMxYjFhNGE1Mgo+Pj4+Pj4gQXV0aG9yOiBEYW1pZW4gTGVzcGlhdSA8ZGFtaWVuLmxlc3Bp YXVAaW50ZWwuY29tPgo+Pj4+Pj4gRGF0ZTogICBUaHUgRmViIDUgMTg6MzA6MjAgMjAxNSArMDAw MAo+Pj4+Pj4KPj4+Pj4+ICAgICAgZHJtL2k5MTU6IERvbid0IHRyeSB0byByZWZlcmVuY2UgdGhl IGZiIGluIGdldF9pbml0aWFsX3BsYW5lX2NvbmZpZygpCj4+Pj4+Pgo+Pj4+Pj4gIEZyb20gbGlu dXgtbmV4dD8KPj4+Pj4gWWVzLCBidWlsZGluZyBub3cuICBXaWxsIGxldCB5b3Uga25vdyBhcyBz b29uIGFzIEkgdGVzdCBpdCBvbiBib3RoIG1hY2hpbmVzLgo+Pj4+IE9LLCB3aXRoIHRoYXQgY29t bWl0IGFwcGxpZWQgSSBubyBsb25nZXIgZ2V0IHRoZSBrcmVmLmggc3BsYXQgYW5kIHRoZQo+Pj4+ IE5VQyBtYWNoaW5lIGJvb3RzIGhlYWRsZXNzLiAgSSBzdGlsbCBzZWUgdGhlIGJhY2t0cmFjZSBi ZWxvdyBvbiBib3RoCj4+Pj4gdGhlIE5VQyBhbmQgdGhlIG1hY2Jvb2suICBJIGhhdmUgYSBjb3B5 IG9mIGl0IHdpdGggZHJtLmRlYnVnPTB4ZmYgZnJvbQo+Pj4+IHRoZSBOVUMgaGVyZToKPj4+Pgo+ Pj4+IGh0dHBzOi8vandib3llci5mZWRvcmFwZW9wbGUub3JnL3B1Yi9udWMtZHJtLWRlYnVnLWZm LXdpdGgtZml4ZXMudHh0Cj4+Pj4KPj4+PiBHZXR0aW5nIGJldHRlciBhdCBsZWFzdCA6KS4KPj4+ IE9uIHRvcCBvZiB3aGF0IHlvdSBjdXJyZW50bHkgaGF2ZSBwbGVhc2UgYWxzbyBjaGVycnktcGlj awo+Pj4KPj4+IGNvbW1pdCBmYjk5ODFhYTY3NWViN2IzOTg4NDk5MTUzNjQ5MTZmZDk4ODMzY2Zh Cj4+PiBBdXRob3I6IERhbWllbiBMZXNwaWF1IDxkYW1pZW4ubGVzcGlhdUBpbnRlbC5jb20+Cj4+ PiBEYXRlOiAgIFRodSBGZWIgNSAxOToyNDoyNSAyMDE1ICswMDAwCj4+Pgo+Pj4gICAgICBkcm0v aTkxNTogRml4IGF0b21pYyBzdGF0ZSB3aGVuIHJldXNpbmcgdGhlIGZpcm13YXJlIGZiCj4+Pgo+ Pj4gZnJvbSAtbmV4dC4gTGV0J3MgaG9wZSB0aGlzIHRlcm1pbmF0ZXMgZXZlbnR1YWxseSA7LSkK Pj4gSG0uICBUaGF0IG9uZSBkb2Vzbid0IGFwcGx5IGNsZWFubHkuICBJIHRoaW5rIGJlY2F1c2Ug aXQgbmVlZHM6Cj4+Cj4+ICBGcm9tIDJkMTQwMzBiMWE5ZDBlODljZmRjYTZmMTY4NTFlMmVhYzhj YjRkZTAgTW9uIFNlcCAxNyAwMDowMDowMCAyMDAxCj4+IEZyb206IERhbWllbiBMZXNwaWF1IDxk YW1pZW4ubGVzcGlhdUBpbnRlbC5jb20+Cj4+IERhdGU6IFRodSwgNSBGZWIgMjAxNSAxNzoyMjox OCArMDAwMAo+PiBTdWJqZWN0OiBkcm0vaTkxNTogU3RvcmUgdGhlIGluaXRpYWwgZnJhbWVidWZm ZXIgaW4gaW5pdGlhbF9wbGFuZV9jb25maWcKPj4KPj4gZmlyc3QuICBEbyB5b3Ugd2FudCBtZSB0 byBncmFiIGJvdGgsIG9yIHNob3VsZCBJIHRyeSBhbmQgZmlndXJlIG91dAo+PiBob3cgdG8gYmFj a3BvcnQgZmI5OTgxYWE2NyB3aXRob3V0IGl0Pwo+IE9vcHMgbWlzc2VkIHRoYXQuIFRoZSBhY3Rp dmUgaW5ncmVkaWVudCBpcyBzZXR0aW5nIGNydGMtPnByaW1hcnktPnN0YXRlLT5jcnRjIGxpa2Ug dGhpczoKPiAtRGFuaWVsCj4KPgo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiBp bmRleCAxYzEyMjYyMDI5ZmIuLmJmYzE0YTYwNDZlYSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMKPiBAQCAtMjQzOSw2ICsyNDM5LDcgQEAgaW50ZWxfZmluZF9wbGFuZV9v Ymooc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMsCj4gICAJCXJldHVybjsKPiAgIAo+ICAg CWlmIChpbnRlbF9hbGxvY19wbGFuZV9vYmooaW50ZWxfY3J0YywgcGxhbmVfY29uZmlnKSkgewo+ ICsJCWludGVsX2NydGMtPmJhc2UucHJpbWFyeS0+c3RhdGUtPmNydGMgPSAmaW50ZWxfY3J0Yy0+ YmFzZTsKPiAgIAkJdXBkYXRlX3N0YXRlX2ZiKGludGVsX2NydGMtPmJhc2UucHJpbWFyeSk7Cj4g ICAJCXJldHVybjsKPiAgIAl9Cj4gQEAgLTI0NjksNiArMjQ3MCw3IEBAIGludGVsX2ZpbmRfcGxh bmVfb2JqKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAo+ICAgCj4gICAJCQlkcm1fZnJh bWVidWZmZXJfcmVmZXJlbmNlKGMtPnByaW1hcnktPmZiKTsKPiAgIAkJCWludGVsX2NydGMtPmJh c2UucHJpbWFyeS0+ZmIgPSBjLT5wcmltYXJ5LT5mYjsKPiArCQkJaW50ZWxfY3J0Yy0+YmFzZS5w cmltYXJ5LT5zdGF0ZS0+Y3J0YyA9ICZpbnRlbF9jcnRjLT5iYXNlOwo+ICAgCQkJb2JqLT5mcm9u dGJ1ZmZlcl9iaXRzIHw9IElOVEVMX0ZST05UQlVGRkVSX1BSSU1BUlkoaW50ZWxfY3J0Yy0+cGlw ZSk7Cj4gICAJCQlicmVhazsKPiAgIAkJfQpJIGZvdW5kIGEgYmFkIHRoaW5nLiBNeSBidWdneSBj b2RlIGFsc28gYWZmZWN0cyBsaW51eC1uZXh0IG5vdyBiZWNhdXNlIG9mCnRoZSBtYW51YWwgbWVy Z2Ugb24gMjAxNC0wMy0xNi4KClNvLCBEYW5pZWwgYW5kIFN0ZXBoZW4gcGxlYXNlIGNoZWNrIGl0 IGFuZCBlbmQgdGhpcyBtZXNzLi4uCgpJdCdzIGFubm95aW5nIHRvIHNlZSBteSBjb2RlIGNhdXNl ZCBzbyBtdWNoIHRyb3VibGUuIEkgZGlkbid0IHRlc3QgbXkgY29kZQp3aXRoIGEgSERNSSBkZXZp Y2Ugb3IgSSBzaG91bGQndmUgZm91bmQgdGhpcyB0cm91YmxlIGJlZm9yZSBjb21taXRpbmcuIEkK YXBvbG9naXplIGZvciB0aGF0IGFnYWluLgoKLS0gClhpIFJ1b3lhbwpTY2hvb2wgb2YgQWVyb3Nw YWNlIFNjaWVuY2UgYW5kIFRlY2hub2xvZ3kKWGlkaWFuIFVuaXZlcnNpdHksIFhpJ2FuLCBDaGlu YQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK