---

yaml --- r: 286832 b: refs/heads/master c: 07c1e8c h: refs/heads/master v: v3
git-mirror · Jan 9, 2012 · f56fca2 · f56fca2
1 parent 33adcec
commit f56fca2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e5b7fa2ad84f7806d0c7f5af8e1440bc91b4ec7
+refs/heads/master: 07c1e8c1462fa7324de4c36ae9e55da2abd79cee
diff --git a/trunk/drivers/gpu/drm/i915/i915_suspend.c b/trunk/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