diff options
| author | Adam Jackson | 2011-10-07 20:38:42 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2012-01-17 12:52:11 +0100 |
| commit | 28c057945ef5d164925db4fccc64207ee58c8681 (patch) | |
| tree | 76e7ca3936333bbae3f33efe28f47a2d2d0553d2 /drivers/gpu/drm/i915/intel_display.c | |
| parent | drivers: i915: Fix BLC PWM register setup (diff) | |
| download | kernel-qcow2-linux-28c057945ef5d164925db4fccc64207ee58c8681.tar.gz kernel-qcow2-linux-28c057945ef5d164925db4fccc64207ee58c8681.tar.xz kernel-qcow2-linux-28c057945ef5d164925db4fccc64207ee58c8681.zip | |
drm/i915: Implement plane-disabled assertion for PCH too
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 5fa1476cbfc6..d775f954c1b6 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -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++) { |