projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1f70385
)
drm/i915: WARN if the pipe won't turn off
author
Daniel Vetter
<daniel.vetter@ffwll.ch>
Mon, 9 Jul 2012 07:51:57 +0000
(09:51 +0200)
committer
Daniel Vetter
<daniel.vetter@ffwll.ch>
Thu, 6 Sep 2012 06:21:28 +0000
(08:21 +0200)
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>
drivers/gpu/drm/i915/intel_display.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/intel_display.c
b/drivers/gpu/drm/i915/intel_display.c
index 9a0661122da7c927ee79514737dbb20216a48325..453bc7cf1841ac18f3fcfdf364e2b360472dec26 100644
(file)
--- a/
drivers/gpu/drm/i915/intel_display.c
+++ b/
drivers/gpu/drm/i915/intel_display.c
@@
-1006,7
+1006,7
@@
void intel_wait_for_pipe_off(struct drm_device *dev, int pipe)
/* Wait for the Pipe State to go off */
if (wait_for((I915_READ(reg) & I965_PIPECONF_ACTIVE) == 0,
100))
-
DRM_DEBUG_KMS(
"pipe_off wait timed out\n");
+
WARN(1,
"pipe_off wait timed out\n");
} else {
u32 last_line, line_mask;
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) &&
time_after(timeout, jiffies));
if (time_after(jiffies, timeout))
-
DRM_DEBUG_KMS(
"pipe_off wait timed out\n");
+
WARN(1,
"pipe_off wait timed out\n");
}
}