leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
This seems to be the symptom of a few neat bugs, hence be more
obnoxious when this fails.

Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2012-07-09 09:51:57 +02:00
parent 1f70385510
commit 284637d922
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/i915/intel_display.c
View File

@ -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)
} 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");
} }
} }