On Wed, 25 Mar 2015, Josh Boyer <jwboyer@xxxxxxxxxxxxxxxxx> wrote: > On Wed, Mar 25, 2015 at 1:17 PM, Daniel Vetter <daniel@xxxxxxxx> 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@xxxxxxxx -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel
