From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jesse Barnes Subject: Re: [PATCH 54/58] drm/i915: WARN if the pipe won't turn off Date: Wed, 5 Sep 2012 11:18:37 -0700 Message-ID: <20120905111837.600dd68a@jbarnes-desktop> References: <1345403595-9678-1-git-send-email-daniel.vetter@ffwll.ch> <1345403595-9678-55-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from oproxy9.bluehost.com (oproxy9.bluehost.com [69.89.24.6]) by gabe.freedesktop.org (Postfix) with SMTP id 196B8A09DC for ; Wed, 5 Sep 2012 11:18:38 -0700 (PDT) In-Reply-To: <1345403595-9678-55-git-send-email-daniel.vetter@ffwll.ch> 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: Daniel Vetter Cc: Intel Graphics Development List-Id: intel-gfx@lists.freedesktop.org On Sun, 19 Aug 2012 21:13:11 +0200 Daniel Vetter wrote: > This seems to be the symptom of a few neat bugs, hence be more > obnoxious when this fails. > > Signed-Off-by: Daniel Vetter > --- > drivers/gpu/drm/i915/intel_display.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index a716893..da45d39 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -1006,7 +1006,7 @@ void intel_wait_for_pipe_off(struct drm_device *dev, int pipe) > /* Wait for the Pipe State to go off */ > if (wait_for((I915_READ(reg) & I965_PIPECONF_ACTIVE) == 0, > 100)) > - DRM_DEBUG_KMS("pipe_off wait timed out\n"); > + WARN(1, "pipe_off wait timed out\n"); > } else { > u32 last_line, line_mask; > int reg = PIPEDSL(pipe); > @@ -1024,7 +1024,7 @@ void intel_wait_for_pipe_off(struct drm_device *dev, int pipe) > } while (((I915_READ(reg) & line_mask) != last_line) && > time_after(timeout, jiffies)); > if (time_after(jiffies, timeout)) > - DRM_DEBUG_KMS("pipe_off wait timed out\n"); > + WARN(1, "pipe_off wait timed out\n"); > } > } > I hope we can actually fix all the issues this will report... :) Reviewed-by: Jesse Barnes -- Jesse Barnes, Intel Open Source Technology Center