From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756184AbaGNQrs (ORCPT ); Mon, 14 Jul 2014 12:47:48 -0400 Received: from cpsmtpb-ews04.kpnxchange.com ([213.75.39.7]:51833 "EHLO cpsmtpb-ews04.kpnxchange.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755690AbaGNQrm (ORCPT ); Mon, 14 Jul 2014 12:47:42 -0400 Message-ID: <1405356460.2066.5.camel@x41> Subject: Re: drm: i915: "plane B assertion failure, should be off on pipe B but is still active" From: Paul Bolle To: Daniel Vetter Cc: Jani Nikula , Daniel Vetter , David Airlie , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Date: Mon, 14 Jul 2014 18:47:40 +0200 In-Reply-To: <20140714071823.GE15237@phenom.ffwll.local> References: <1404140703.2978.13.camel@x41> <87egy5h1yz.fsf@intel.com> <1404291203.12021.18.camel@x220> <1405283561.2103.9.camel@x41> <20140714065610.GA15237@phenom.ffwll.local> <1405322020.19403.0.camel@x220> <20140714071823.GE15237@phenom.ffwll.local> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.10.4 (3.10.4-2.fc20) Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 14 Jul 2014 16:47:40.0552 (UTC) FILETIME=[53625880:01CF9F83] X-RcptDomain: vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Bolle Subject: Re: drm: i915: "plane B assertion failure, should be off on pipe B but is still active" Date: Mon, 14 Jul 2014 18:47:40 +0200 Message-ID: <1405356460.2066.5.camel@x41> References: <1404140703.2978.13.camel@x41> <87egy5h1yz.fsf@intel.com> <1404291203.12021.18.camel@x220> <1405283561.2103.9.camel@x41> <20140714065610.GA15237@phenom.ffwll.local> <1405322020.19403.0.camel@x220> <20140714071823.GE15237@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20140714071823.GE15237@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Daniel Vetter Cc: Daniel Vetter , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org 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