---

yaml --- r: 307431 b: refs/heads/master c: 461bc9b h: refs/heads/master i: 307429: b8c280b 307427: cd0f208 307423: 8fe08b9 v: v3
git-mirror · May 19, 2012 · 8bf7526 · 8bf7526
1 parent 18ca573
commit 8bf7526
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a416edefbbaf942b588595ad6fa63ac700f5d73c
+refs/heads/master: 461bc9b587389586edf9315b337fb136f33594ad
diff --git a/trunk/drivers/gpu/drm/i915/intel_pm.c b/trunk/drivers/gpu/drm/i915/intel_pm.c
@@ -1803,8 +1803,7 @@ static void sandybridge_update_wm(struct drm_device *dev)
 		enabled |= 2;
 	}
 
-	/* IVB has 3 pipes */
-	if (IS_IVYBRIDGE(dev) &&
+	if ((dev_priv->num_pipe == 3) &&
 	    g4x_compute_wm0(dev, 2,
 			    &sandybridge_display_wm_info, latency,
 			    &sandybridge_cursor_wm_info, latency,