From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/i915: Convert BUG_ON(!pll->active) and friends to a WARN Date: Sun, 13 May 2012 22:08:10 +0200 Message-ID: <20120513200810.GG4720@phenom.ffwll.local> References: <1336899249-2612-1-git-send-email-chris@chris-wilson.co.uk> <1336936572-19548-1-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-wi0-f177.google.com (mail-wi0-f177.google.com [209.85.212.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 20A6E9E76E for ; Sun, 13 May 2012 13:07:00 -0700 (PDT) Received: by wibhm14 with SMTP id hm14so2291285wib.12 for ; Sun, 13 May 2012 13:07:00 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1336936572-19548-1-git-send-email-chris@chris-wilson.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Chris Wilson Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Sun, May 13, 2012 at 08:16:12PM +0100, Chris Wilson wrote: > Turn a fatal lockup into a merely blank display with lots of shouty > messages. > > v2: Whilst in the area, convert the other BUG_ON into less fatal errors. > In particular, note that we may be called on a PCH platform not using > PLLs, such as Haswell, and so we do not always want to BUG_ON(!pll) > > Signed-off-by: Chris Wilson Ok, I guess you want me to drop v1 of this again. I'll wait for a bit of feedback on these two then (and the tested-by from qa on the 2nd one). -Daniel > --- > drivers/gpu/drm/i915/intel_display.c | 21 +++++++++++++++------ > 1 file changed, 15 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 12dba60..f9e1e1c 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -1473,14 +1473,18 @@ out_unlock: > static void intel_enable_pch_pll(struct intel_crtc *intel_crtc) > { > struct drm_i915_private *dev_priv = intel_crtc->base.dev->dev_private; > - struct intel_pch_pll *pll = intel_crtc->pch_pll; > + struct intel_pch_pll *pll; > int reg; > u32 val; > > - /* PCH only available on ILK+ */ > + /* PCH PLLs only available on ILK, SNB and IVB */ > BUG_ON(dev_priv->info->gen < 5); > - BUG_ON(pll == NULL); > - BUG_ON(pll->refcount == 0); > + pll = intel_crtc->pch_pll; > + if (pll == NULL) > + return; > + > + if (WARN_ON(pll->refcount == 0)) > + return; > > DRM_DEBUG_KMS("enable PCH PLL %x (active %d, on? %d)for crtc %d\n", > pll->pll_reg, pll->active, pll->on, > @@ -1518,13 +1522,18 @@ static void intel_disable_pch_pll(struct intel_crtc *intel_crtc) > if (pll == NULL) > return; > > - BUG_ON(pll->refcount == 0); > + if (WARN_ON(pll->refcount == 0)) > + return; > > DRM_DEBUG_KMS("disable PCH PLL %x (active %d, on? %d) for crtc %d\n", > pll->pll_reg, pll->active, pll->on, > intel_crtc->base.base.id); > > - BUG_ON(pll->active == 0); > + if (WARN_ON(pll->active == 0)) { > + assert_pch_pll_disabled(dev_priv, intel_crtc); > + return; > + } > + > if (--pll->active) { > assert_pch_pll_enabled(dev_priv, intel_crtc); > return; > -- > 1.7.10 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Mail: daniel@ffwll.ch Mobile: +41 (0)79 365 57 48