From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933407AbbCYPNM (ORCPT ); Wed, 25 Mar 2015 11:13:12 -0400 Received: from blu004-omc3s14.hotmail.com ([65.55.116.89]:52761 "EHLO BLU004-OMC3S14.hotmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932172AbbCYPNE (ORCPT ); Wed, 25 Mar 2015 11:13:04 -0400 X-TMN: [gil30E4NbdA9mFz/F1ilgSHa+9z2H3S+] X-Originating-Email: [xry111@outlook.com] Message-ID: Date: Wed, 25 Mar 2015 23:12:55 +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: Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 25 Mar 2015 15:13:03.0243 (UTC) FILETIME=[305E3DB0:01D0670E] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 03/25/2015 at 10:56 PM, Xi Ruoyao wrote: > > 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... > I reviewed linux-next. Stephen has dealed with it correctly. > 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. I am very upset because of my error now (>_<). I think the only thing I can help now is view linux-next and find all commits about my 319c1d420a0b, since my commit is a cheery-picking from linux-next. -- 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 23:12:55 +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: 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 CgpPbiAwMy8yNS8yMDE1IGF0IDEwOjU2IFBNLCBYaSBSdW95YW8gd3JvdGU6Cj4KPiBPbiAwMy8y NS8yMDE1IGF0IDEwOjAwIFBNLCBEYW5pZWwgVmV0dGVyIHdyb3RlOgo+PiBPbiBXZWQsIE1hciAy NSwgMjAxNSBhdCAwOToxMToxN0FNIC0wNDAwLCBKb3NoIEJveWVyIHdyb3RlOgo+Pj4gT24gV2Vk LCBNYXIgMjUsIDIwMTUgYXQgNDo1NCBBTSwgRGFuaWVsIFZldHRlciA8ZGFuaWVsQGZmd2xsLmNo PiB3cm90ZToKPj4+Pj4+PiBjb21taXQgZjU1NTQ4YjVhZjg3ZWJmYzU4NmNhNzU3NDg5NDdmMWMx YjFhNGE1Mgo+Pj4+Pj4+IEF1dGhvcjogRGFtaWVuIExlc3BpYXUgPGRhbWllbi5sZXNwaWF1QGlu dGVsLmNvbT4KPj4+Pj4+PiBEYXRlOiAgIFRodSBGZWIgNSAxODozMDoyMCAyMDE1ICswMDAwCj4+ Pj4+Pj4KPj4+Pj4+PiAgICAgIGRybS9pOTE1OiBEb24ndCB0cnkgdG8gcmVmZXJlbmNlIHRoZSBm YiBpbiAKPj4+Pj4+PiBnZXRfaW5pdGlhbF9wbGFuZV9jb25maWcoKQo+Pj4+Pj4+Cj4+Pj4+Pj4g IEZyb20gbGludXgtbmV4dD8KPj4+Pj4+IFllcywgYnVpbGRpbmcgbm93LiAgV2lsbCBsZXQgeW91 IGtub3cgYXMgc29vbiBhcyBJIHRlc3QgaXQgb24gCj4+Pj4+PiBib3RoIG1hY2hpbmVzLgo+Pj4+ PiBPSywgd2l0aCB0aGF0IGNvbW1pdCBhcHBsaWVkIEkgbm8gbG9uZ2VyIGdldCB0aGUga3JlZi5o IHNwbGF0IGFuZCB0aGUKPj4+Pj4gTlVDIG1hY2hpbmUgYm9vdHMgaGVhZGxlc3MuICBJIHN0aWxs IHNlZSB0aGUgYmFja3RyYWNlIGJlbG93IG9uIGJvdGgKPj4+Pj4gdGhlIE5VQyBhbmQgdGhlIG1h Y2Jvb2suICBJIGhhdmUgYSBjb3B5IG9mIGl0IHdpdGggZHJtLmRlYnVnPTB4ZmYgCj4+Pj4+IGZy b20KPj4+Pj4gdGhlIE5VQyBoZXJlOgo+Pj4+Pgo+Pj4+PiBodHRwczovL2p3Ym95ZXIuZmVkb3Jh cGVvcGxlLm9yZy9wdWIvbnVjLWRybS1kZWJ1Zy1mZi13aXRoLWZpeGVzLnR4dAo+Pj4+Pgo+Pj4+ PiBHZXR0aW5nIGJldHRlciBhdCBsZWFzdCA6KS4KPj4+PiBPbiB0b3Agb2Ygd2hhdCB5b3UgY3Vy cmVudGx5IGhhdmUgcGxlYXNlIGFsc28gY2hlcnJ5LXBpY2sKPj4+Pgo+Pj4+IGNvbW1pdCBmYjk5 ODFhYTY3NWViN2IzOTg4NDk5MTUzNjQ5MTZmZDk4ODMzY2ZhCj4+Pj4gQXV0aG9yOiBEYW1pZW4g TGVzcGlhdSA8ZGFtaWVuLmxlc3BpYXVAaW50ZWwuY29tPgo+Pj4+IERhdGU6ICAgVGh1IEZlYiA1 IDE5OjI0OjI1IDIwMTUgKzAwMDAKPj4+Pgo+Pj4+ICAgICAgZHJtL2k5MTU6IEZpeCBhdG9taWMg c3RhdGUgd2hlbiByZXVzaW5nIHRoZSBmaXJtd2FyZSBmYgo+Pj4+Cj4+Pj4gZnJvbSAtbmV4dC4g TGV0J3MgaG9wZSB0aGlzIHRlcm1pbmF0ZXMgZXZlbnR1YWxseSA7LSkKPj4+IEhtLiAgVGhhdCBv bmUgZG9lc24ndCBhcHBseSBjbGVhbmx5LiAgSSB0aGluayBiZWNhdXNlIGl0IG5lZWRzOgo+Pj4K Pj4+ICBGcm9tIDJkMTQwMzBiMWE5ZDBlODljZmRjYTZmMTY4NTFlMmVhYzhjYjRkZTAgTW9uIFNl cCAxNyAwMDowMDowMCAyMDAxCj4+PiBGcm9tOiBEYW1pZW4gTGVzcGlhdSA8ZGFtaWVuLmxlc3Bp YXVAaW50ZWwuY29tPgo+Pj4gRGF0ZTogVGh1LCA1IEZlYiAyMDE1IDE3OjIyOjE4ICswMDAwCj4+ PiBTdWJqZWN0OiBkcm0vaTkxNTogU3RvcmUgdGhlIGluaXRpYWwgZnJhbWVidWZmZXIgaW4gCj4+ PiBpbml0aWFsX3BsYW5lX2NvbmZpZwo+Pj4KPj4+IGZpcnN0LiAgRG8geW91IHdhbnQgbWUgdG8g Z3JhYiBib3RoLCBvciBzaG91bGQgSSB0cnkgYW5kIGZpZ3VyZSBvdXQKPj4+IGhvdyB0byBiYWNr cG9ydCBmYjk5ODFhYTY3IHdpdGhvdXQgaXQ/Cj4+IE9vcHMgbWlzc2VkIHRoYXQuIFRoZSBhY3Rp dmUgaW5ncmVkaWVudCBpcyBzZXR0aW5nIAo+PiBjcnRjLT5wcmltYXJ5LT5zdGF0ZS0+Y3J0YyBs aWtlIHRoaXM6Cj4+IC1EYW5pZWwKPj4KPj4KPj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYyAKPj4gYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMKPj4gaW5kZXggMWMxMjI2MjAyOWZiLi5iZmMxNGE2MDQ2ZWEgMTAwNjQ0Cj4+IC0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+PiArKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPj4gQEAgLTI0MzksNiArMjQzOSw3IEBAIGlu dGVsX2ZpbmRfcGxhbmVfb2JqKHN0cnVjdCBpbnRlbF9jcnRjIAo+PiAqaW50ZWxfY3J0YywKPj4g ICAgICAgICAgIHJldHVybjsKPj4gICAgICAgICBpZiAoaW50ZWxfYWxsb2NfcGxhbmVfb2JqKGlu dGVsX2NydGMsIHBsYW5lX2NvbmZpZykpIHsKPj4gKyAgICAgICAgaW50ZWxfY3J0Yy0+YmFzZS5w cmltYXJ5LT5zdGF0ZS0+Y3J0YyA9ICZpbnRlbF9jcnRjLT5iYXNlOwo+PiAgICAgICAgICAgdXBk YXRlX3N0YXRlX2ZiKGludGVsX2NydGMtPmJhc2UucHJpbWFyeSk7Cj4+ICAgICAgICAgICByZXR1 cm47Cj4+ICAgICAgIH0KPj4gQEAgLTI0NjksNiArMjQ3MCw3IEBAIGludGVsX2ZpbmRfcGxhbmVf b2JqKHN0cnVjdCBpbnRlbF9jcnRjIAo+PiAqaW50ZWxfY3J0YywKPj4gICAgICAgICAgICAgICAg IGRybV9mcmFtZWJ1ZmZlcl9yZWZlcmVuY2UoYy0+cHJpbWFyeS0+ZmIpOwo+PiAgICAgICAgICAg ICAgIGludGVsX2NydGMtPmJhc2UucHJpbWFyeS0+ZmIgPSBjLT5wcmltYXJ5LT5mYjsKPj4gKyAg ICAgICAgICAgIGludGVsX2NydGMtPmJhc2UucHJpbWFyeS0+c3RhdGUtPmNydGMgPSAmaW50ZWxf Y3J0Yy0+YmFzZTsKPj4gICAgICAgICAgICAgICBvYmotPmZyb250YnVmZmVyX2JpdHMgfD0gCj4+ IElOVEVMX0ZST05UQlVGRkVSX1BSSU1BUlkoaW50ZWxfY3J0Yy0+cGlwZSk7Cj4+ICAgICAgICAg ICAgICAgYnJlYWs7Cj4+ICAgICAgICAgICB9Cj4gSSBmb3VuZCBhIGJhZCB0aGluZy4gTXkgYnVn Z3kgY29kZSBhbHNvIGFmZmVjdHMgbGludXgtbmV4dCBub3cgYmVjYXVzZSBvZgo+IHRoZSBtYW51 YWwgbWVyZ2Ugb24gMjAxNC0wMy0xNi4KPgo+IFNvLCBEYW5pZWwgYW5kIFN0ZXBoZW4gcGxlYXNl IGNoZWNrIGl0IGFuZCBlbmQgdGhpcyBtZXNzLi4uCj4KSSByZXZpZXdlZCBsaW51eC1uZXh0LiBT dGVwaGVuIGhhcyBkZWFsZWQgd2l0aCBpdCBjb3JyZWN0bHkuCj4gSXQncyBhbm5veWluZyB0byBz ZWUgbXkgY29kZSBjYXVzZWQgc28gbXVjaCB0cm91YmxlLiBJIGRpZG4ndCB0ZXN0IG15IAo+IGNv ZGUKPiB3aXRoIGEgSERNSSBkZXZpY2Ugb3IgSSBzaG91bGQndmUgZm91bmQgdGhpcyB0cm91Ymxl IGJlZm9yZSBjb21taXRpbmcuIEkKPiBhcG9sb2dpemUgZm9yIHRoYXQgYWdhaW4uCkkgYW0gdmVy eSB1cHNldCBiZWNhdXNlIG9mIG15IGVycm9yIG5vdyAoPl88KS4gSSB0aGluayB0aGUgb25seSB0 aGluZyBJIGNhbgpoZWxwIG5vdyBpcyB2aWV3IGxpbnV4LW5leHQgYW5kIGZpbmQgYWxsIGNvbW1p dHMgYWJvdXQgbXkgMzE5YzFkNDIwYTBiLApzaW5jZSBteSBjb21taXQgaXMgYSBjaGVlcnktcGlj a2luZyBmcm9tIGxpbnV4LW5leHQuCgotLSAKWGkgUnVveWFvClNjaG9vbCBvZiBBZXJvc3BhY2Ug U2NpZW5jZSBhbmQgVGVjaG5vbG9neQpYaWRpYW4gVW5pdmVyc2l0eSwgWGknYW4sIENoaW5hCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=