On Wed, 23 Sep 2015, Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx> wrote: > Hey, > > Op 23-09-15 om 12:29 schreef Jani Nikula: >> On Wed, 23 Sep 2015, Daniel Vetter <daniel@xxxxxxxx> wrote: >>> On Tue, Sep 15, 2015 at 02:28:54PM +0200, Maarten Lankhorst wrote: >>>> This fixes the warnings like >>>> >>>> "plane A assertion failure, should be disabled but not" >>>> >>>> that on the initial modeset during boot. This can happen if >>>> the primary plane is enabled by the firmware, but inheriting >>>> it fails because the DMAR is active or for other reasons. >>>> >>>> Reported-By: Andreas Reis <andreas.reis@xxxxxxxxx> >>>> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91429 >>>> Reported-and-Tested-by: Emil Renner Berthing <kernel@xxxxxxxx> >>> Tested-by: Andreas Reis <andreas.reis@xxxxxxxxx> >>> Reviewed-by: Daniel Vetter <daniel.vetter@xxxxxxxx> >>> >>> Most likely caused by >>> >>> commit 36750f284b3a4f19b304fda1bb7d6e9e1275ea8d >>> Author: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx> >>> Date: Mon Jun 1 12:49:54 2015 +0200 >>> >>> drm/i915: update plane state during init >>> >>> which is in 4.3, so this of for Jani. >> What's the deal with this patch wrt >> >> commit f9cd7b881a042dcc8f1b1236ecea6deb3eb4d5bd >> Author: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> >> Date: Thu Sep 10 18:59:08 2015 +0300 >> >> drm/i915: Move sprite/cursor plane disable to intel_sanitize_crtc() >> >> i.e. do we need a different patch for drm-intel-next-queued? >> > Indeed, and a different patch for v4.2 which you commented on. :-) > crtc_mask needs to be updated here if plane_state->visible is true. Okay, I pushed the patch do drm-intel-fixes, thanks for the patch and review. I resolving the conflict on nightly rebuild with what's in drm-intel-next-queued. Please send another patch against dinq. BR, Jani. > > ~Maarten -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
