---

yaml --- r: 307171 b: refs/heads/master c: c51ed78 h: refs/heads/master i: 307169: f136942 307167: c32f6e8 v: v3
git-mirror · Apr 17, 2012 · b7eedc1 · b7eedc1
1 parent 6a75bef
commit b7eedc1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 246bdbeb0f0fb14c4c085b6ed7edbab11afccd33
+refs/heads/master: c51ed787f6c49de7c2180c0f78e1d0e1360c7e86
diff --git a/trunk/drivers/gpu/drm/i915/i915_dma.c b/trunk/drivers/gpu/drm/i915/i915_dma.c
@@ -2115,7 +2115,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
 	spin_lock_init(&dev_priv->error_lock);
 	spin_lock_init(&dev_priv->rps_lock);
 
-	if (IS_IVYBRIDGE(dev))
+	if (IS_IVYBRIDGE(dev) || IS_HASWELL(dev))
 		dev_priv->num_pipe = 3;
 	else if (IS_MOBILE(dev) || !IS_GEN2(dev))
 		dev_priv->num_pipe = 2;