From: Ville Syrjälä Date: Mon, 18 Apr 2016 11:29:32 +0000 (+0300) Subject: drm/i915: Replace nondescript 'WARN_ON(!lret)' with a sensible error message X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=8a8dae260f5df805fe062875fef272ffccaf727f;p=openwrt%2Fstaging%2Fblogic.git 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 Signed-off-by: Ville Syrjälä Link: http://patchwork.freedesktop.org/patch/msgid/1460978973-24945-1-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Maarten Lankhorst --- 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); }