diff mbox

[3/6] drm/i915: warn when a vblank wait times out

Message ID 1396653132-908-3-git-send-email-jbarnes@virtuousgeek.org (mailing list archive)
State New, archived
Headers show

Commit Message

Jesse Barnes April 4, 2014, 11:12 p.m. UTC 
This always indicates a bug somewhere.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
---
 drivers/gpu/drm/i915/intel_display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Chris Wilson April 5, 2014, 6:29 a.m. UTC | #1 
On Fri, Apr 04, 2014 at 04:12:09PM -0700, Jesse Barnes wrote:
> This always indicates a bug somewhere.

We keep turning this off because we hadn't fixed all the bugs - as we
try to wait on a dead pipe. Maybe this time we won't be inundated with
WARNs...
-Chris
Daniel Vetter April 5, 2014, 3:22 p.m. UTC | #2 
On Sat, Apr 05, 2014 at 07:29:22AM +0100, Chris Wilson wrote:
> On Fri, Apr 04, 2014 at 04:12:09PM -0700, Jesse Barnes wrote:
> > This always indicates a bug somewhere.
> 
> We keep turning this off because we hadn't fixed all the bugs - as we
> try to wait on a dead pipe. Maybe this time we won't be inundated with
> WARNs...

We're really early in the 3.16 cycle. If Jesse promises to chase down all
the fallout I'll happily merge this - we really need to get this done
sometimes.
-Daniel
Jesse Barnes April 5, 2014, 6:52 p.m. UTC | #3 
On Sat, 5 Apr 2014 17:22:40 +0200
Daniel Vetter <daniel@ffwll.ch> wrote:

> On Sat, Apr 05, 2014 at 07:29:22AM +0100, Chris Wilson wrote:
> > On Fri, Apr 04, 2014 at 04:12:09PM -0700, Jesse Barnes wrote:
> > > This always indicates a bug somewhere.
> > 
> > We keep turning this off because we hadn't fixed all the bugs - as we
> > try to wait on a dead pipe. Maybe this time we won't be inundated with
> > WARNs...
> 
> We're really early in the 3.16 cycle. If Jesse promises to chase down all
> the fallout I'll happily merge this - we really need to get this done
> sometimes.

It helped me find a missing backport in the Chromium tree for the
vblank code on BYT, so it's already been helpful.

Let the flood of bug reports begin!
Daniel Vetter April 7, 2014, 6:20 a.m. UTC | #4 
On Sat, Apr 05, 2014 at 11:52:38AM -0700, Jesse Barnes wrote:
> On Sat, 5 Apr 2014 17:22:40 +0200
> Daniel Vetter <daniel@ffwll.ch> wrote:
> 
> > On Sat, Apr 05, 2014 at 07:29:22AM +0100, Chris Wilson wrote:
> > > On Fri, Apr 04, 2014 at 04:12:09PM -0700, Jesse Barnes wrote:
> > > > This always indicates a bug somewhere.
> > > 
> > > We keep turning this off because we hadn't fixed all the bugs - as we
> > > try to wait on a dead pipe. Maybe this time we won't be inundated with
> > > WARNs...
> > 
> > We're really early in the 3.16 cycle. If Jesse promises to chase down all
> > the fallout I'll happily merge this - we really need to get this done
> > sometimes.
> 
> It helped me find a missing backport in the Chromium tree for the
> vblank code on BYT, so it's already been helpful.
> 
> Let the flood of bug reports begin!

Ok ;-) Queued for -next, thanks for the patch.
-Daniel
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 6a6406f..c039f34 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -765,7 +765,7 @@  static void g4x_wait_for_vblank(struct drm_device *dev, int pipe)
 	frame = I915_READ(frame_reg);
 
 	if (wait_for(I915_READ_NOTRACE(frame_reg) != frame, 50))
-		DRM_DEBUG_KMS("vblank wait timed out\n");
+		WARN(1, "vblank wait timed out\n");
 }
 
 /**