Commit 85a62bf9 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Daniel Vetter

drm/i915: Also record time difference if vblank evasion fails, v2.

This makes the error message slightly more useful.

Changes since v1:
- Use ktime_get() while irqs are still disabled. (vsyrjala)
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 34e0adbb
...@@ -564,6 +564,8 @@ struct intel_crtc { ...@@ -564,6 +564,8 @@ struct intel_crtc {
int scanline_offset; int scanline_offset;
unsigned start_vbl_count; unsigned start_vbl_count;
ktime_t start_vbl_time;
struct intel_crtc_atomic_commit atomic; struct intel_crtc_atomic_commit atomic;
/* scalers available on this crtc */ /* scalers available on this crtc */
......
...@@ -134,6 +134,7 @@ void intel_pipe_update_start(struct intel_crtc *crtc) ...@@ -134,6 +134,7 @@ void intel_pipe_update_start(struct intel_crtc *crtc)
drm_crtc_vblank_put(&crtc->base); drm_crtc_vblank_put(&crtc->base);
crtc->start_vbl_time = ktime_get();
crtc->start_vbl_count = dev->driver->get_vblank_counter(dev, pipe); crtc->start_vbl_count = dev->driver->get_vblank_counter(dev, pipe);
trace_i915_pipe_update_vblank_evaded(crtc, min, max, trace_i915_pipe_update_vblank_evaded(crtc, min, max,
...@@ -154,14 +155,16 @@ void intel_pipe_update_end(struct intel_crtc *crtc) ...@@ -154,14 +155,16 @@ void intel_pipe_update_end(struct intel_crtc *crtc)
struct drm_device *dev = crtc->base.dev; struct drm_device *dev = crtc->base.dev;
enum pipe pipe = crtc->pipe; enum pipe pipe = crtc->pipe;
u32 end_vbl_count = dev->driver->get_vblank_counter(dev, pipe); u32 end_vbl_count = dev->driver->get_vblank_counter(dev, pipe);
ktime_t end_vbl_time = ktime_get();
trace_i915_pipe_update_end(crtc, end_vbl_count); trace_i915_pipe_update_end(crtc, end_vbl_count);
local_irq_enable(); local_irq_enable();
if (crtc->start_vbl_count && crtc->start_vbl_count != end_vbl_count) if (crtc->start_vbl_count && crtc->start_vbl_count != end_vbl_count)
DRM_ERROR("Atomic update failure on pipe %c (start=%u end=%u)\n", DRM_ERROR("Atomic update failure on pipe %c (start=%u end=%u) time %lld us\n",
pipe_name(pipe), crtc->start_vbl_count, end_vbl_count); pipe_name(pipe), crtc->start_vbl_count, end_vbl_count,
ktime_us_delta(end_vbl_time, crtc->start_vbl_time));
} }
static void static void
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment