Commit 28c05794 authored by Adam Jackson's avatar Adam Jackson Committed by Daniel Vetter

drm/i915: Implement plane-disabled assertion for PCH too

Signed-off-by: default avatarAdam Jackson <ajax@redhat.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 2aded1b6
...@@ -970,8 +970,14 @@ static void assert_planes_disabled(struct drm_i915_private *dev_priv, ...@@ -970,8 +970,14 @@ static void assert_planes_disabled(struct drm_i915_private *dev_priv,
int cur_pipe; int cur_pipe;
/* Planes are fixed to pipes on ILK+ */ /* Planes are fixed to pipes on ILK+ */
if (HAS_PCH_SPLIT(dev_priv->dev)) if (HAS_PCH_SPLIT(dev_priv->dev)) {
reg = DSPCNTR(pipe);
val = I915_READ(reg);
WARN((val & DISPLAY_PLANE_ENABLE),
"plane %c assertion failure, should be disabled but not\n",
plane_name(pipe));
return; return;
}
/* Need to check both planes against the pipe */ /* Need to check both planes against the pipe */
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
......
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