Commit 284637d9 authored by Daniel Vetter's avatar Daniel Vetter

drm/i915: WARN if the pipe won't turn off

This seems to be the symptom of a few neat bugs, hence be more
obnoxious when this fails.
Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-Off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 1f703855
...@@ -1006,7 +1006,7 @@ void intel_wait_for_pipe_off(struct drm_device *dev, int pipe) ...@@ -1006,7 +1006,7 @@ void intel_wait_for_pipe_off(struct drm_device *dev, int pipe)
/* Wait for the Pipe State to go off */ /* Wait for the Pipe State to go off */
if (wait_for((I915_READ(reg) & I965_PIPECONF_ACTIVE) == 0, if (wait_for((I915_READ(reg) & I965_PIPECONF_ACTIVE) == 0,
100)) 100))
DRM_DEBUG_KMS("pipe_off wait timed out\n"); WARN(1, "pipe_off wait timed out\n");
} else { } else {
u32 last_line, line_mask; u32 last_line, line_mask;
int reg = PIPEDSL(pipe); int reg = PIPEDSL(pipe);
...@@ -1024,7 +1024,7 @@ void intel_wait_for_pipe_off(struct drm_device *dev, int pipe) ...@@ -1024,7 +1024,7 @@ void intel_wait_for_pipe_off(struct drm_device *dev, int pipe)
} while (((I915_READ(reg) & line_mask) != last_line) && } while (((I915_READ(reg) & line_mask) != last_line) &&
time_after(timeout, jiffies)); time_after(timeout, jiffies));
if (time_after(jiffies, timeout)) if (time_after(jiffies, timeout))
DRM_DEBUG_KMS("pipe_off wait timed out\n"); WARN(1, "pipe_off wait timed out\n");
} }
} }
......
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