Re: drm: i915: "plane B assertion failure, should be off on pipe B but is still active"

Paul Bolle
2014-07-14T16:47:40Z

Daniel Vetter schreef op ma 14-07-2014 om 09:18 [+0200]:
> On Mon, Jul 14, 2014 at 09:13:40AM +0200, Paul Bolle wrote:
> > On Mon, 2014-07-14 at 08:56 +0200, Daniel Vetter wrote:
> > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> > > index 82e7d57f0a8a..f0be855ddf45 100644
> > > --- a/drivers/gpu/drm/i915/intel_display.c
> > > +++ b/drivers/gpu/drm/i915/intel_display.c
> > > @@ -11914,6 +11914,7 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc)
> > > * ... */
> > > plane = crtc->plane;
> > > crtc->plane = !plane;
> > > + crtc->primary_enabled = true;
> > > dev_priv->display.crtc_disable(&crtc->base);
> > > crtc->plane = plane;
> > >
> >
> > Instead of the revert or on top of the revert?
>
> Instead of the revert as an attempt at a proper bugfix. If it doesn't work
> my theory about what's going on on your machine is all wrong ;-)

v3.16-rc5 with that "attempt at a proper bugfix" applied doesn't show
the WARNING anymore.

Please note that I didn't actually bother to test whether v3.16-rc5 by
itself, somehow, fixed things. I guess that's rather unlikely. But if
you'd like to be sure I'll even build and boot v3.16-rc5 without your
attempt at a bugfix.

Thanks!

Paul Bolle