p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Maarten Lankhorst 2015-09-01 12:15:33 +02:00 committed by Daniel Vetter
parent 34e0adbb45
commit 85a62bf9d8
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/i915/intel_drv.h
View File

@ -564,6 +564,8 @@ struct intel_crtc {
int scanline_offset;
unsigned start_vbl_count;
ktime_t start_vbl_time;
struct intel_crtc_atomic_commit atomic;
/* scalers available on this crtc */

7
drivers/gpu/drm/i915/intel_sprite.c
View File

@ -134,6 +134,7 @@ void intel_pipe_update_start(struct intel_crtc *crtc)
drm_crtc_vblank_put(&crtc->base);
crtc->start_vbl_time = ktime_get();
crtc->start_vbl_count = dev->driver->get_vblank_counter(dev, pipe);
trace_i915_pipe_update_vblank_evaded(crtc, min, max,
@ -154,14 +155,16 @@ void intel_pipe_update_end(struct intel_crtc *crtc)
struct drm_device *dev = crtc->base.dev;
enum pipe pipe = crtc->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);
local_irq_enable();
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",
pipe_name(pipe), crtc->start_vbl_count, end_vbl_count);
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,
ktime_us_delta(end_vbl_time, crtc->start_vbl_time));
}
static void