From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752723AbbCXOc7 (ORCPT ); Tue, 24 Mar 2015 10:32:59 -0400 Received: from mail-wi0-f171.google.com ([209.85.212.171]:36206 "EHLO mail-wi0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751917AbbCXOc4 (ORCPT ); Tue, 24 Mar 2015 10:32:56 -0400 Date: Tue, 24 Mar 2015 15:34:40 +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: <20150324143439.GK1349@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: <20150324073219.GV1349@phenom.ffwll.local> <20150324134011.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 Tue, Mar 24, 2015 at 10:22:30AM -0400, Josh Boyer wrote: > On Tue, Mar 24, 2015 at 9:57 AM, Josh Boyer wrote: > > On Tue, Mar 24, 2015 at 9:40 AM, Daniel Vetter wrote: > >> On Tue, Mar 24, 2015 at 09:15:32AM -0400, Josh Boyer wrote: > >>> On Tue, Mar 24, 2015 at 3:32 AM, Daniel Vetter wrote: > >>> > On Mon, Mar 23, 2015 at 02:34:27PM -0400, Josh Boyer wrote: > >>> >> On Mon, Mar 23, 2015 at 11:33 AM, Josh Boyer wrote: > >>> >> > >>> >> > >>> >> > >>> >> >> Xi Ruoyao (1): > >>> >> >> drm/i915: Ensure plane->state->fb stays in sync with plane->fb > >>> >> > >>> >> Turns out to be that commit. > >>> >> > >>> >> git bisect start 'drivers/gpu/drm/i915/' > >>> >> # good: [b314acaccd7e0d55314d96be4a33b5f50d0b3344] Merge branch > >>> >> 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input > >>> >> git bisect good b314acaccd7e0d55314d96be4a33b5f50d0b3344 > >>> >> # bad: [bc465aa9d045feb0e13b4a8f32cc33c1943f62d6] Linux 4.0-rc5 > >>> >> git bisect bad bc465aa9d045feb0e13b4a8f32cc33c1943f62d6 > >>> >> # bad: [319c1d420a0b62d9dbb88104afebaabc968cdbfa] drm/i915: Ensure > >>> >> plane->state->fb stays in sync with plane->fb > >>> >> git bisect bad 319c1d420a0b62d9dbb88104afebaabc968cdbfa > >>> >> # first bad commit: [319c1d420a0b62d9dbb88104afebaabc968cdbfa] > >>> >> drm/i915: Ensure plane->state->fb stays in sync with plane->fb > >>> >> > >>> >> Doing a straight revert on top of 4.0-rc5 makes things work again, > >>> >> albeit with the WARN_ON(obj->frontbuffer_bits) splat still being > >>> >> there. > >>> > > >>> > Can you please test the tip of drm-fixes: > >>> > > >>> > commit 8218c3f4df3bb1c637c17552405039a6dd3c1ee1 > >>> > Author: Daniel Vetter > >>> > Date: Fri Feb 27 12:58:13 2015 +0100 > >>> > > >>> > drm: Fixup racy refcounting in plane_force_disable > >>> > > >>> > http://cgit.freedesktop.org/~airlied/linux/commit/?h=drm-fixes&id=8218c3f4df3bb1c637c17552405039a6dd3c1ee1 > >>> > > >>> > Because fumble that patch didn't make it to drm-fixes a while ago and > >>> > instead landed in drm-next. > >>> > >>> That seems to have helped with totally different issues a macbook I > >>> have was seeing. However, it still doesn't fix the issue with the > >>> Celeron based NUC machine. > >>> > >>> I built a kernel based on Linus' latest tree as of this morning, > >>> without reverting 319c1d4 and adding the commit you pointed to. The > >>> NUC still won't boot without HDMI connected. With HDMI connected I > >>> still see the trace below. If I do the blacklist and then insmod > >>> dance with HDMI unplugged it shows the same spew I reported yesterday > >>> which starts with the same backtrace. > >>> > >>> I'll try building a kernel with 319c1d4 reverted + your patch. I > >>> suspect things will work fine with that combination because the two > >>> issues are unrelated. > >> > >> Can you please boot with drm.debug=0xff for the below case and grab > >> complete dmesg? There'll be a lot of crap in the logs, you might need to > >> blow up the logbuf size massively. But that log should contain everything > >> I need to figure out where that framebuffer we're blowing up on is going. > > > > I provided both with HDMI attached and without (via insmod). If you > > want them emailed directly let me know, but they were large. > > > > Boot with drm.debug=0xff and HDMI connected: > > > > https://jwboyer.fedorapeople.org/pub/drm-ff-dmesg.txt > > > > Boot with drm.debug=0xff without HDMI connected and i915 loaded via > > manual insmod after boot: > > > > https://jwboyer.fedorapeople.org/pub/drm-ff-no-hdmi-insmod.txt > > Here's one more from the macbook I mentioned. It's showing the same > kref.h splat: > > https://jwboyer.fedorapeople.org/pub/drm-ff-macbook.txt Ok there's at least one fixup for which we've failed to apply when porting the fb refcounting fix from -next. Can you please cherry-pick 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? Thanks, 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: Tue, 24 Mar 2015 15:34:40 +0100 Message-ID: <20150324143439.GK1349@phenom.ffwll.local> References: <20150324073219.GV1349@phenom.ffwll.local> <20150324134011.GJ1349@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com [209.85.212.178]) by gabe.freedesktop.org (Postfix) with ESMTP id F3F7B6E70F for ; Tue, 24 Mar 2015 07:32:55 -0700 (PDT) Received: by wibdy8 with SMTP id dy8so76593344wib.0 for ; Tue, 24 Mar 2015 07:32:55 -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 T24gVHVlLCBNYXIgMjQsIDIwMTUgYXQgMTA6MjI6MzBBTSAtMDQwMCwgSm9zaCBCb3llciB3cm90 ZToKPiBPbiBUdWUsIE1hciAyNCwgMjAxNSBhdCA5OjU3IEFNLCBKb3NoIEJveWVyIDxqd2JveWVy QGZlZG9yYXByb2plY3Qub3JnPiB3cm90ZToKPiA+IE9uIFR1ZSwgTWFyIDI0LCAyMDE1IGF0IDk6 NDAgQU0sIERhbmllbCBWZXR0ZXIgPGRhbmllbEBmZndsbC5jaD4gd3JvdGU6Cj4gPj4gT24gVHVl LCBNYXIgMjQsIDIwMTUgYXQgMDk6MTU6MzJBTSAtMDQwMCwgSm9zaCBCb3llciB3cm90ZToKPiA+ Pj4gT24gVHVlLCBNYXIgMjQsIDIwMTUgYXQgMzozMiBBTSwgRGFuaWVsIFZldHRlciA8ZGFuaWVs QGZmd2xsLmNoPiB3cm90ZToKPiA+Pj4gPiBPbiBNb24sIE1hciAyMywgMjAxNSBhdCAwMjozNDoy N1BNIC0wNDAwLCBKb3NoIEJveWVyIHdyb3RlOgo+ID4+PiA+PiBPbiBNb24sIE1hciAyMywgMjAx NSBhdCAxMTozMyBBTSwgSm9zaCBCb3llciA8andib3llckBmZWRvcmFwcm9qZWN0Lm9yZz4gd3Jv dGU6Cj4gPj4+ID4+Cj4gPj4+ID4+IDxzbmlwPgo+ID4+PiA+Pgo+ID4+PiA+PiA+PiBYaSBSdW95 YW8gKDEpOgo+ID4+PiA+PiA+PiAgICAgICBkcm0vaTkxNTogRW5zdXJlIHBsYW5lLT5zdGF0ZS0+ ZmIgc3RheXMgaW4gc3luYyB3aXRoIHBsYW5lLT5mYgo+ID4+PiA+Pgo+ID4+PiA+PiBUdXJucyBv dXQgdG8gYmUgdGhhdCBjb21taXQuCj4gPj4+ID4+Cj4gPj4+ID4+IGdpdCBiaXNlY3Qgc3RhcnQg J2RyaXZlcnMvZ3B1L2RybS9pOTE1LycKPiA+Pj4gPj4gIyBnb29kOiBbYjMxNGFjYWNjZDdlMGQ1 NTMxNGQ5NmJlNGEzM2I1ZjUwZDBiMzM0NF0gTWVyZ2UgYnJhbmNoCj4gPj4+ID4+ICdmb3ItbGlu dXMnIG9mIGdpdDovL2dpdC5rZXJuZWwub3JnL3B1Yi9zY20vbGludXgva2VybmVsL2dpdC9kdG9y L2lucHV0Cj4gPj4+ID4+IGdpdCBiaXNlY3QgZ29vZCBiMzE0YWNhY2NkN2UwZDU1MzE0ZDk2YmU0 YTMzYjVmNTBkMGIzMzQ0Cj4gPj4+ID4+ICMgYmFkOiBbYmM0NjVhYTlkMDQ1ZmViMGUxM2I0YThm MzJjYzMzYzE5NDNmNjJkNl0gTGludXggNC4wLXJjNQo+ID4+PiA+PiBnaXQgYmlzZWN0IGJhZCBi YzQ2NWFhOWQwNDVmZWIwZTEzYjRhOGYzMmNjMzNjMTk0M2Y2MmQ2Cj4gPj4+ID4+ICMgYmFkOiBb MzE5YzFkNDIwYTBiNjJkOWRiYjg4MTA0YWZlYmFhYmM5NjhjZGJmYV0gZHJtL2k5MTU6IEVuc3Vy ZQo+ID4+PiA+PiBwbGFuZS0+c3RhdGUtPmZiIHN0YXlzIGluIHN5bmMgd2l0aCBwbGFuZS0+ZmIK PiA+Pj4gPj4gZ2l0IGJpc2VjdCBiYWQgMzE5YzFkNDIwYTBiNjJkOWRiYjg4MTA0YWZlYmFhYmM5 NjhjZGJmYQo+ID4+PiA+PiAjIGZpcnN0IGJhZCBjb21taXQ6IFszMTljMWQ0MjBhMGI2MmQ5ZGJi ODgxMDRhZmViYWFiYzk2OGNkYmZhXQo+ID4+PiA+PiBkcm0vaTkxNTogRW5zdXJlIHBsYW5lLT5z dGF0ZS0+ZmIgc3RheXMgaW4gc3luYyB3aXRoIHBsYW5lLT5mYgo+ID4+PiA+Pgo+ID4+PiA+PiBE b2luZyBhIHN0cmFpZ2h0IHJldmVydCBvbiB0b3Agb2YgNC4wLXJjNSBtYWtlcyB0aGluZ3Mgd29y ayBhZ2FpbiwKPiA+Pj4gPj4gYWxiZWl0IHdpdGggdGhlIFdBUk5fT04ob2JqLT5mcm9udGJ1ZmZl cl9iaXRzKSBzcGxhdCBzdGlsbCBiZWluZwo+ID4+PiA+PiB0aGVyZS4KPiA+Pj4gPgo+ID4+PiA+ IENhbiB5b3UgcGxlYXNlIHRlc3QgdGhlIHRpcCBvZiBkcm0tZml4ZXM6Cj4gPj4+ID4KPiA+Pj4g PiBjb21taXQgODIxOGMzZjRkZjNiYjFjNjM3YzE3NTUyNDA1MDM5YTZkZDNjMWVlMQo+ID4+PiA+ IEF1dGhvcjogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KPiA+Pj4gPiBE YXRlOiAgIEZyaSBGZWIgMjcgMTI6NTg6MTMgMjAxNSArMDEwMAo+ID4+PiA+Cj4gPj4+ID4gICAg IGRybTogRml4dXAgcmFjeSByZWZjb3VudGluZyBpbiBwbGFuZV9mb3JjZV9kaXNhYmxlCj4gPj4+ ID4KPiA+Pj4gPiBodHRwOi8vY2dpdC5mcmVlZGVza3RvcC5vcmcvfmFpcmxpZWQvbGludXgvY29t bWl0Lz9oPWRybS1maXhlcyZpZD04MjE4YzNmNGRmM2JiMWM2MzdjMTc1NTI0MDUwMzlhNmRkM2Mx ZWUxCj4gPj4+ID4KPiA+Pj4gPiBCZWNhdXNlIGZ1bWJsZSB0aGF0IHBhdGNoIGRpZG4ndCBtYWtl IGl0IHRvIGRybS1maXhlcyBhIHdoaWxlIGFnbyBhbmQKPiA+Pj4gPiBpbnN0ZWFkIGxhbmRlZCBp biBkcm0tbmV4dC4KPiA+Pj4KPiA+Pj4gVGhhdCBzZWVtcyB0byBoYXZlIGhlbHBlZCB3aXRoIHRv dGFsbHkgZGlmZmVyZW50IGlzc3VlcyBhIG1hY2Jvb2sgSQo+ID4+PiBoYXZlIHdhcyBzZWVpbmcu ICBIb3dldmVyLCBpdCBzdGlsbCBkb2Vzbid0IGZpeCB0aGUgaXNzdWUgd2l0aCB0aGUKPiA+Pj4g Q2VsZXJvbiBiYXNlZCBOVUMgbWFjaGluZS4KPiA+Pj4KPiA+Pj4gSSBidWlsdCBhIGtlcm5lbCBi YXNlZCBvbiBMaW51cycgbGF0ZXN0IHRyZWUgYXMgb2YgdGhpcyBtb3JuaW5nLAo+ID4+PiB3aXRo b3V0IHJldmVydGluZyAzMTljMWQ0IGFuZCBhZGRpbmcgdGhlIGNvbW1pdCB5b3UgcG9pbnRlZCB0 by4gIFRoZQo+ID4+PiBOVUMgc3RpbGwgd29uJ3QgYm9vdCB3aXRob3V0IEhETUkgY29ubmVjdGVk LiAgV2l0aCBIRE1JIGNvbm5lY3RlZCBJCj4gPj4+IHN0aWxsIHNlZSB0aGUgdHJhY2UgYmVsb3cu ICBJZiBJIGRvIHRoZSBibGFja2xpc3QgYW5kIHRoZW4gaW5zbW9kCj4gPj4+IGRhbmNlIHdpdGgg SERNSSB1bnBsdWdnZWQgaXQgc2hvd3MgdGhlIHNhbWUgc3BldyBJIHJlcG9ydGVkIHllc3RlcmRh eQo+ID4+PiB3aGljaCBzdGFydHMgd2l0aCB0aGUgc2FtZSBiYWNrdHJhY2UuCj4gPj4+Cj4gPj4+ IEknbGwgdHJ5IGJ1aWxkaW5nIGEga2VybmVsIHdpdGggMzE5YzFkNCByZXZlcnRlZCArIHlvdXIg cGF0Y2guICBJCj4gPj4+IHN1c3BlY3QgdGhpbmdzIHdpbGwgd29yayBmaW5lIHdpdGggdGhhdCBj b21iaW5hdGlvbiBiZWNhdXNlIHRoZSB0d28KPiA+Pj4gaXNzdWVzIGFyZSB1bnJlbGF0ZWQuCj4g Pj4KPiA+PiBDYW4geW91IHBsZWFzZSBib290IHdpdGggZHJtLmRlYnVnPTB4ZmYgZm9yIHRoZSBi ZWxvdyBjYXNlIGFuZCBncmFiCj4gPj4gY29tcGxldGUgZG1lc2c/IFRoZXJlJ2xsIGJlIGEgbG90 IG9mIGNyYXAgaW4gdGhlIGxvZ3MsIHlvdSBtaWdodCBuZWVkIHRvCj4gPj4gYmxvdyB1cCB0aGUg bG9nYnVmIHNpemUgbWFzc2l2ZWx5LiBCdXQgdGhhdCBsb2cgc2hvdWxkIGNvbnRhaW4gZXZlcnl0 aGluZwo+ID4+IEkgbmVlZCB0byBmaWd1cmUgb3V0IHdoZXJlIHRoYXQgZnJhbWVidWZmZXIgd2Un cmUgYmxvd2luZyB1cCBvbiBpcyBnb2luZy4KPiA+Cj4gPiBJIHByb3ZpZGVkIGJvdGggd2l0aCBI RE1JIGF0dGFjaGVkIGFuZCB3aXRob3V0ICh2aWEgaW5zbW9kKS4gIElmIHlvdQo+ID4gd2FudCB0 aGVtIGVtYWlsZWQgZGlyZWN0bHkgbGV0IG1lIGtub3csIGJ1dCB0aGV5IHdlcmUgbGFyZ2UuCj4g Pgo+ID4gQm9vdCB3aXRoIGRybS5kZWJ1Zz0weGZmIGFuZCBIRE1JIGNvbm5lY3RlZDoKPiA+Cj4g PiBodHRwczovL2p3Ym95ZXIuZmVkb3JhcGVvcGxlLm9yZy9wdWIvZHJtLWZmLWRtZXNnLnR4dAo+ ID4KPiA+IEJvb3Qgd2l0aCBkcm0uZGVidWc9MHhmZiB3aXRob3V0IEhETUkgY29ubmVjdGVkIGFu ZCBpOTE1IGxvYWRlZCB2aWEKPiA+IG1hbnVhbCBpbnNtb2QgYWZ0ZXIgYm9vdDoKPiA+Cj4gPiBo dHRwczovL2p3Ym95ZXIuZmVkb3JhcGVvcGxlLm9yZy9wdWIvZHJtLWZmLW5vLWhkbWktaW5zbW9k LnR4dAo+IAo+IEhlcmUncyBvbmUgbW9yZSBmcm9tIHRoZSBtYWNib29rIEkgbWVudGlvbmVkLiAg SXQncyBzaG93aW5nIHRoZSBzYW1lCj4ga3JlZi5oIHNwbGF0Ogo+IAo+IGh0dHBzOi8vandib3ll ci5mZWRvcmFwZW9wbGUub3JnL3B1Yi9kcm0tZmYtbWFjYm9vay50eHQKCk9rIHRoZXJlJ3MgYXQg bGVhc3Qgb25lIGZpeHVwIGZvciB3aGljaCB3ZSd2ZSBmYWlsZWQgdG8gYXBwbHkgd2hlbiBwb3J0 aW5nCnRoZSBmYiByZWZjb3VudGluZyBmaXggZnJvbSAtbmV4dC4gQ2FuIHlvdSBwbGVhc2UgY2hl cnJ5LXBpY2sKCmNvbW1pdCBmNTU1NDhiNWFmODdlYmZjNTg2Y2E3NTc0ODk0N2YxYzFiMWE0YTUy CkF1dGhvcjogRGFtaWVuIExlc3BpYXUgPGRhbWllbi5sZXNwaWF1QGludGVsLmNvbT4KRGF0ZTog ICBUaHUgRmViIDUgMTg6MzA6MjAgMjAxNSArMDAwMAoKICAgIGRybS9pOTE1OiBEb24ndCB0cnkg dG8gcmVmZXJlbmNlIHRoZSBmYiBpbiBnZXRfaW5pdGlhbF9wbGFuZV9jb25maWcoKQoKRnJvbSBs aW51eC1uZXh0PwoKVGhhbmtzLCBEYW5pZWwKLS0gCkRhbmllbCBWZXR0ZXIKU29mdHdhcmUgRW5n aW5lZXIsIEludGVsIENvcnBvcmF0aW9uCmh0dHA6Ly9ibG9nLmZmd2xsLmNoCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxp c3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==