From: Eugeni Dodonov <eugeni.dodonov@intel.com>
Date: Sun, 8 Jan 2012 01:40:35 +0000 (-0200)
Subject: drm/i915: handle 3rd pipe
X-Git-Tag: v3.3-rc2~20^2~3^2~16^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=07c1e8c1462fa7324de4c36ae9e55da2abd79cee;p=karo-tx-linux.git

drm/i915: handle 3rd pipe

We don't need to check 3rd pipe specifically, as it shares PLL with some
other one.

Signed-off-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
index c0b945cdcd9a..30d924f447c0 100644
--- a/drivers/gpu/drm/i915/i915_suspend.c
+++ b/drivers/gpu/drm/i915/i915_suspend.c
@@ -35,6 +35,10 @@ static bool i915_pipe_enabled(struct drm_device *dev, enum pipe pipe)
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	u32	dpll_reg;
 
+	/* On IVB, 3rd pipe shares PLL with another one */
+	if (pipe > 1)
+		return false;
+
 	if (HAS_PCH_SPLIT(dev))
 		dpll_reg = PCH_DPLL(pipe);
 	else