Re: [Intel-gfx] [PATCH] drm/i915: Print the pipe on which the vblank wait times out

2014-08-26 Thread Daniel Vetter
On Wed, Aug 20, 2014 at 02:45:37PM +0100, Thomas Wood wrote:
 On 18 August 2014 13:51, Damien Lespiau damien.lesp...@intel.com wrote:
  Pimp up the debug message that tells us we've been waiting for a vblank
  that never arrived. Printing the pipe could lead a doh! moment where
  we've been waiting for a vblank on a pipe that was off for instance.
 
  Signed-off-by: Damien Lespiau damien.lesp...@intel.com
 
 Reviewed-by: Thomas Wood thomas.w...@intel.com

Queued for -next, thanks for the patch.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx


Re: [Intel-gfx] [PATCH] drm/i915: Print the pipe on which the vblank wait times out

2014-08-20 Thread Thomas Wood
On 18 August 2014 13:51, Damien Lespiau damien.lesp...@intel.com wrote:
 Pimp up the debug message that tells us we've been waiting for a vblank
 that never arrived. Printing the pipe could lead a doh! moment where
 we've been waiting for a vblank on a pipe that was off for instance.

 Signed-off-by: Damien Lespiau damien.lesp...@intel.com

Reviewed-by: Thomas Wood thomas.w...@intel.com

 ---
  drivers/gpu/drm/i915/intel_display.c | 6 --
  1 file changed, 4 insertions(+), 2 deletions(-)

 diff --git a/drivers/gpu/drm/i915/intel_display.c 
 b/drivers/gpu/drm/i915/intel_display.c
 index f602924..71d3487 100644
 --- a/drivers/gpu/drm/i915/intel_display.c
 +++ b/drivers/gpu/drm/i915/intel_display.c
 @@ -900,7 +900,8 @@ 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))
 -   WARN(1, vblank wait timed out\n);
 +   WARN(1, vblank wait on pipe %c timed out\n,
 +pipe_name(pipe));
  }

  /**
 @@ -941,7 +942,8 @@ void intel_wait_for_vblank(struct drm_device *dev, int 
 pipe)
 if (wait_for(I915_READ(pipestat_reg) 
  PIPE_VBLANK_INTERRUPT_STATUS,
  50))
 -   DRM_DEBUG_KMS(vblank wait timed out\n);
 +   DRM_DEBUG_KMS(vblank wait on pipe %c timed out\n,
 + pipe_name(pipe));
  }

  static bool pipe_dsl_stopped(struct drm_device *dev, enum pipe pipe)
 --
 1.8.3.1

 ___
 Intel-gfx mailing list
 Intel-gfx@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/intel-gfx
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx


[Intel-gfx] [PATCH] drm/i915: Print the pipe on which the vblank wait times out

2014-08-18 Thread Damien Lespiau
Pimp up the debug message that tells us we've been waiting for a vblank
that never arrived. Printing the pipe could lead a doh! moment where
we've been waiting for a vblank on a pipe that was off for instance.

Signed-off-by: Damien Lespiau damien.lesp...@intel.com
---
 drivers/gpu/drm/i915/intel_display.c | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c 
b/drivers/gpu/drm/i915/intel_display.c
index f602924..71d3487 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -900,7 +900,8 @@ 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))
-   WARN(1, vblank wait timed out\n);
+   WARN(1, vblank wait on pipe %c timed out\n,
+pipe_name(pipe));
 }
 
 /**
@@ -941,7 +942,8 @@ void intel_wait_for_vblank(struct drm_device *dev, int pipe)
if (wait_for(I915_READ(pipestat_reg) 
 PIPE_VBLANK_INTERRUPT_STATUS,
 50))
-   DRM_DEBUG_KMS(vblank wait timed out\n);
+   DRM_DEBUG_KMS(vblank wait on pipe %c timed out\n,
+ pipe_name(pipe));
 }
 
 static bool pipe_dsl_stopped(struct drm_device *dev, enum pipe pipe)
-- 
1.8.3.1

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx