From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [Intel-gfx] [git pull] drm fixes Date: Thu, 26 Mar 2015 14:06:47 +0200 Message-ID: <877fu4rmi0.fsf@intel.com> References: <20150324143439.GK1349@phenom.ffwll.local> <20150325085418.GQ1349@phenom.ffwll.local> <20150325140008.GJ1349@phenom.ffwll.local> <20150325155003.GL1349@phenom.ffwll.local> <20150325171703.GM1349@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: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Josh Boyer , Daniel Vetter , Dave Airlie , Xi Ruoyao , Linus Torvalds , "Linux-Kernel@Vger. Kernel. Org" , DRI mailing list , Intel Graphics Development List-Id: dri-devel@lists.freedesktop.org T24gV2VkLCAyNSBNYXIgMjAxNSwgSm9zaCBCb3llciA8andib3llckBmZWRvcmFwcm9qZWN0Lm9y Zz4gd3JvdGU6Cj4gT24gV2VkLCBNYXIgMjUsIDIwMTUgYXQgMToxNyBQTSwgRGFuaWVsIFZldHRl ciA8ZGFuaWVsQGZmd2xsLmNoPiB3cm90ZToKPj4gT24gV2VkLCBNYXIgMjUsIDIwMTUgYXQgMTI6 NDI6NDZQTSAtMDQwMCwgSm9zaCBCb3llciB3cm90ZToKPj4+ID4gSSdsbCB0cnkgdGhhdCBhIGJp dCBsYXRlciB0b2RheS4gIE91dCBvZiBzaGVlciBjdXJpb3NpdHksIEkgZm9sZGVkCj4+PiA+IGNv bW1pdDViYTc2YzQxZTU1YyAoZHJtL2k5MTU6IFB1dCB1cGRhdGVfc3RhdGVfZmIoKSBuZXh0IHRv IHRoZSBmYgo+Pj4gPiB1cGRhdGUpIGludG8gdGhlIHBhdGNoIGFib3ZlIGFuZCBraWNrZWQgb2Zm IGEgYnVpbGQuICBUaGUgdGhlb3J5IGlzCj4+PiA+IHRoYXQgd2UncmUgcGlja2luZyB1cCBhIGJ1 bmNoIG9mIG90aGVyIGNoYW5nZXMgcmlnaHQgaW4gdGhhdCByYW5nZSBvZgo+Pj4gPiBjb21taXRz LCB3aHkgbm90IHRyeSBvbmUgbW9yZS4gIEknbGwgbGV0IHlvdSBrbm93IGlmIHRoYXQgZml4ZXMK Pj4+ID4gYW55dGhpbmcuICBPdGhlcndpc2UsIEknbGwgdHJ5IGJ1aWxkaW5nIGRybS1pbnRlbC1u aWdodGx5IGFuZC9vcgo+Pj4gPiBsaW51eC1uZXh0IGFmdGVyIHRoYXQuCj4+Pgo+Pj4gVGhlIGRy bS1pbnRlbC1uaWdodGx5IGJ1aWxkIGZpbmlzaGVkIGZpcnN0LiAgSXQgYm9vdHMgd2l0aG91dCBI RE1JCj4+PiBwbHVnZ2VkIGluLCBidXQgaXQgaGFzIHByZXR0eSBtdWNoIHRoZSBzYW1lIHNwbGF0 cyBhcyB0aGUgcHJldmlvdXMKPj4+IGtlcm5lbC4gIENvbmZ1c2VkLiAgRnVsbCBsb2cgaGVyZToK Pj4+Cj4+PiBodHRwczovL2p3Ym95ZXIuZmVkb3JhcGVvcGxlLm9yZy9wdWIvaW50ZWwtbmlnaHRs eS50eHQKPj4+Cj4+PiBJIGRvbid0IGhhdmUgbXVjaCBob3BlIGZvciBteSBvdGhlciBidWlsZC4K Pj4KPj4gWWVhaCB0aGF0J3MgYXQgbGVhc3QgZ29vZCBuZXdzIGZvciB0aGUgdGhlb3J5IEkndmUg YmVlbiBjb29raW5nIG1lYW53aGlsZS4KPj4gQ2FuIHlvdSB0cnkgdGhlIGJlbG93IGRpZmYgKG9u IHRvcCBvZiBuZXh0L25pZ2h0bHkpPyBGb3IgdGhlIGN1cnJlbnQKPj4gY2hlcnJ5LXBpY2sgcGls ZSBvbiB0b3Agb2YgNC4wLXJjIHlvdSdkIG5lZWQgdG8gcHJlcGVuZCBpbnRlbF9jcnRjLT5iYXNl Lgo+PiB0byBwcmltYXJ5LT4uLi4KPj4KPj4gVGhhbmtzLCBEYW5pZWwKPj4KPj4gZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+PiBpbmRleCBjZWIyZTYxYjRjOTEuLmNiNTA4NTQyYzZh YiAxMDA2NDQKPj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4+ ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+PiBAQCAtMjU5NCw2 ICsyNTk0LDcgQEAgaW50ZWxfZmluZF9wbGFuZV9vYmooc3RydWN0IGludGVsX2NydGMgKmludGVs X2NydGMsCj4+Cj4+ICAgICAgICAgICAgICAgICBwcmltYXJ5LT5mYiA9ICZwbGFuZV9jb25maWct PmZiLT5iYXNlOwo+PiAgICAgICAgICAgICAgICAgcHJpbWFyeS0+c3RhdGUtPmNydGMgPSAmaW50 ZWxfY3J0Yy0+YmFzZTsKPj4gKyAgICAgICAgICAgICAgIHByaW1hcnktPmNydGMgPSAmaW50ZWxf Y3J0Yy0+YmFzZTsKPj4gICAgICAgICAgICAgICAgIHVwZGF0ZV9zdGF0ZV9mYihwcmltYXJ5KTsK Pj4KPj4gICAgICAgICAgICAgICAgIHJldHVybjsKPj4gQEAgLTI2MjcsNiArMjYyOCw3IEBAIGlu dGVsX2ZpbmRfcGxhbmVfb2JqKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAo+PiAgICAg ICAgICAgICAgICAgICAgICAgICBkcm1fZnJhbWVidWZmZXJfcmVmZXJlbmNlKGMtPnByaW1hcnkt PmZiKTsKPj4gICAgICAgICAgICAgICAgICAgICAgICAgcHJpbWFyeS0+ZmIgPSBjLT5wcmltYXJ5 LT5mYjsKPj4gICAgICAgICAgICAgICAgICAgICAgICAgcHJpbWFyeS0+c3RhdGUtPmNydGMgPSAm aW50ZWxfY3J0Yy0+YmFzZTsKPj4gKyAgICAgICAgICAgICAgICAgICAgICAgcHJpbWFyeS0+Y3J0 YyA9ICZpbnRlbF9jcnRjLT5iYXNlOwo+PiAgICAgICAgICAgICAgICAgICAgICAgICB1cGRhdGVf c3RhdGVfZmIoaW50ZWxfY3J0Yy0+YmFzZS5wcmltYXJ5KTsKPj4gICAgICAgICAgICAgICAgICAg ICAgICAgb2JqLT5mcm9udGJ1ZmZlcl9iaXRzIHw9IElOVEVMX0ZST05UQlVGRkVSX1BSSU1BUlko aW50ZWxfY3J0Yy0+cGlwZSk7Cj4+ICAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwo+Cj4g SGV5LCB0aGF0IHNlZW1zIHRvIGRvIHRoZSB0cmljayBvbiB0aGUgTlVDIG1hY2hpbmUuICBCb290 cyB3aXRob3V0Cj4gSERNSSBjb25uZWN0ZWQgYW5kIHRoZXJlIGFyZSBubyBiYWNrdHJhY2VzLiAg TmljZSEKCkkndmUgcGlja2VkIHRoaXMgWzFdIHVwIGZvciBkcm0taW50ZWwtZml4ZXMgYXMgd2Vs bC4gVGhhbmtzIGZvciB0aGUKdGVzdGluZy4KCkJSLApKYW5pLgoKClsxXSBodHRwOi8vbWlkLmdt YW5lLm9yZy8xNDI3MzA0NjM4LTc4OTctMS1naXQtc2VuZC1lbWFpbC1kYW5pZWwudmV0dGVyQGZm d2xsLmNoCgoKCi0tIApKYW5pIE5pa3VsYSwgSW50ZWwgT3BlbiBTb3VyY2UgVGVjaG5vbG9neSBD ZW50ZXIKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJp LWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752415AbbCZMH6 (ORCPT ); Thu, 26 Mar 2015 08:07:58 -0400 Received: from mga01.intel.com ([192.55.52.88]:46116 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751334AbbCZMH5 (ORCPT ); Thu, 26 Mar 2015 08:07:57 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,471,1422950400"; d="scan'208";a="546655075" From: Jani Nikula To: Josh Boyer , 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 In-Reply-To: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20150324143439.GK1349@phenom.ffwll.local> <20150325085418.GQ1349@phenom.ffwll.local> <20150325140008.GJ1349@phenom.ffwll.local> <20150325155003.GL1349@phenom.ffwll.local> <20150325171703.GM1349@phenom.ffwll.local> User-Agent: Notmuch/0.19+87~gcf99a78 (http://notmuchmail.org) Emacs/24.4.1 (x86_64-pc-linux-gnu) Date: Thu, 26 Mar 2015 14:06:47 +0200 Message-ID: <877fu4rmi0.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 25 Mar 2015, Josh Boyer wrote: > On Wed, Mar 25, 2015 at 1:17 PM, Daniel Vetter wrote: >> On Wed, Mar 25, 2015 at 12:42:46PM -0400, Josh Boyer wrote: >>> > 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. >> >> Yeah that's at least good news for the theory I've been cooking meanwhile. >> Can you try the below diff (on top of next/nightly)? For the current >> cherry-pick pile on top of 4.0-rc you'd need to prepend intel_crtc->base. >> to primary->... >> >> Thanks, Daniel >> >> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c >> index ceb2e61b4c91..cb508542c6ab 100644 >> --- a/drivers/gpu/drm/i915/intel_display.c >> +++ b/drivers/gpu/drm/i915/intel_display.c >> @@ -2594,6 +2594,7 @@ intel_find_plane_obj(struct intel_crtc *intel_crtc, >> >> primary->fb = &plane_config->fb->base; >> primary->state->crtc = &intel_crtc->base; >> + primary->crtc = &intel_crtc->base; >> update_state_fb(primary); >> >> return; >> @@ -2627,6 +2628,7 @@ intel_find_plane_obj(struct intel_crtc *intel_crtc, >> drm_framebuffer_reference(c->primary->fb); >> primary->fb = c->primary->fb; >> primary->state->crtc = &intel_crtc->base; >> + primary->crtc = &intel_crtc->base; >> update_state_fb(intel_crtc->base.primary); >> obj->frontbuffer_bits |= INTEL_FRONTBUFFER_PRIMARY(intel_crtc->pipe); >> break; > > Hey, that seems to do the trick on the NUC machine. Boots without > HDMI connected and there are no backtraces. Nice! I've picked this [1] up for drm-intel-fixes as well. Thanks for the testing. BR, Jani. [1] http://mid.gmane.org/1427304638-7897-1-git-send-email-daniel.vetter@ffwll.ch -- Jani Nikula, Intel Open Source Technology Center