Skip to content

Commit

Permalink
drm/i915: Implement plane-disabled assertion for PCH too
Browse files Browse the repository at this point in the history
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Adam Jackson authored and Daniel Vetter committed Jan 17, 2012
1 parent 2aded1b commit 28c0579
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -970,8 +970,14 @@ static void assert_planes_disabled(struct drm_i915_private *dev_priv,
int cur_pipe;

/* 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;
}

/* Need to check both planes against the pipe */
for (i = 0; i < 2; i++) {
Expand Down

0 comments on commit 28c0579

Please sign in to comment.