From: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Wed, 2 Feb 2011 20:28:02 +0000 (-0800)
Subject: drm/i915: don't check plane vs pipe enable on ILK+
X-Git-Tag: v2.6.39-rc1~458^2~9^2~30
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=19ec135838f032ad1aa0610b173ad78c16d53d47;p=~emulex%2Finfiniband.git

drm/i915: don't check plane vs pipe enable on ILK+

These bits have a different meaning on ILK+, where planes are hardwired
to pipes.  Fixing this avoid some spurious assertion failures.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index b5f7acf5a9d..b14d88d841e 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1225,6 +1225,10 @@ static void assert_planes_disabled(struct drm_i915_private *dev_priv,
 	u32 val;
 	int cur_pipe;
 
+	/* Planes are fixed to pipes on ILK+ */
+	if (HAS_PCH_SPLIT(dev_priv->dev))
+		return;
+
 	/* Need to check both planes against the pipe */
 	for (i = 0; i < 2; i++) {
 		reg = DSPCNTR(i);