summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2016-04-18 14:29:32 +0300
committerVille Syrjälä <ville.syrjala@linux.intel.com>2016-04-18 18:54:15 +0300
commit8a8dae260f5df805fe062875fef272ffccaf727f (patch)
tree3b3e7a38981b4dd431c64f2dc113bcfe5f7c7597 /drivers
parentacf4e84d6167317ff21be5c03e1ea76ea5783701 (diff)
downloadlinux-stable-8a8dae260f5df805fe062875fef272ffccaf727f.tar.gz
linux-stable-8a8dae260f5df805fe062875fef272ffccaf727f.tar.bz2
linux-stable-8a8dae260f5df805fe062875fef272ffccaf727f.zip
drm/i915: Replace nondescript 'WARN_ON(!lret)' with a sensible error message
When a vblank wait times out in intel_atomic_wait_for_vblanks() we just get a cryptic 'WARN_ON(!ret)' backtrace in dmesg. Repace it with something that tells you what actually happened. Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1460978973-24945-1-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index c5b9687091f4..68151271283c 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -13526,7 +13526,7 @@ static void intel_atomic_wait_for_vblanks(struct drm_device *dev,
drm_crtc_vblank_count(crtc),
msecs_to_jiffies(50));
- WARN_ON(!lret);
+ WARN(!lret, "pipe %c vblank wait timed out\n", pipe_name(pipe));
drm_crtc_vblank_put(crtc);
}