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

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:

...

Please test the below patch, thanks. -Daniel

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 ;-) -Daniel