Commit 7b8cd336 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Dave Airlie

drm/i915: Make vblank evade warnings optional

Add a new Kconfig option to enable/disable the extra warnings
from the vblank evade code. For now we'll keep the warning
about an actually missed vblank always enabled as that can have
an actual user visible impact. But if we miss the deadline
othrwise there's no real need to bother the user with that.
We'll want these warnings enabled during development however
so that we can catch regressions.

Based on the reports it looks like this is still very easy
to hit on SKL, so we have more work ahead of us to optimize
the crtiical section further.

Cc: Daniel Vetter <>
Cc: Jani Nikula <>
Cc: Dave Airlie <>
Cc: Jens Axboe <>
Cc: Linus Torvalds <>
Cc: Maarten Lankhorst <>
Reported-by: default avatarJens Axboe <>
Reported-by: default avatarLinus Torvalds <>
Fixes: e1edbd44 ("drm/i915: Complain if we take too long under vblank evasion.")
Signed-off-by: default avatarVille Syrjälä <>
Reviewed-by: default avatarDaniel Vetter <>
Signed-off-by: default avatarDave Airlie <>
parent bb57d041
......@@ -87,3 +87,16 @@ config DRM_I915_LOW_LEVEL_TRACEPOINTS
and also analyze the request dependency resolving timeline.
If in doubt, say "N".
bool "Enable extra debug warnings for vblank evasion"
depends on DRM_I915
default n
Choose this option to turn on extra debug warnings for the
vblank evade mechanism. This gives a warning every time the
the deadline allotted for the vblank evade critical section
is exceeded, even if there isn't an actual risk of missing
the vblank.
If in doubt, say "N".
......@@ -198,12 +198,15 @@ void intel_pipe_update_end(struct intel_crtc *crtc, struct intel_flip_work *work
ktime_us_delta(end_vbl_time, crtc->debug.start_vbl_time),
crtc->debug.min_vbl, crtc->debug.max_vbl,
crtc->debug.scanline_start, scanline_end);
} else if (ktime_us_delta(end_vbl_time, crtc->debug.start_vbl_time) >
else if (ktime_us_delta(end_vbl_time, crtc->debug.start_vbl_time) >
DRM_WARN("Atomic update on pipe (%c) took %lld us, max time under evasion is %u us\n",
ktime_us_delta(end_vbl_time, crtc->debug.start_vbl_time),
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