Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Adam Jackson 2011-10-07 14:38:42 -04:00 committed by Daniel Vetter
parent 2aded1b6bb
commit 28c057945e
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/gpu/drm/i915/intel_display.c
View file

@ -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++) {