aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorEugeni Dodonov <eugeni.dodonov@intel.com>2012-04-13 16:08:45 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-04-17 06:13:08 -0400
commitc51ed787f6c49de7c2180c0f78e1d0e1360c7e86 (patch)
tree21298e08d5dccd32ed77699a18787720939b6afe /drivers/gpu/drm
parent246bdbeb0f0fb14c4c085b6ed7edbab11afccd33 (diff)
drm/i915: haswell has 3 pipes as well
They work differently, but the count is the same. Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com> Signed-off-by: Eugeni Dodonov <eugeni.dodonov@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/i915/i915_dma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 333b7468c8ec..a813f652fa1f 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -2115,7 +2115,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
2115 spin_lock_init(&dev_priv->error_lock); 2115 spin_lock_init(&dev_priv->error_lock);
2116 spin_lock_init(&dev_priv->rps_lock); 2116 spin_lock_init(&dev_priv->rps_lock);
2117 2117
2118 if (IS_IVYBRIDGE(dev)) 2118 if (IS_IVYBRIDGE(dev) || IS_HASWELL(dev))
2119 dev_priv->num_pipe = 3; 2119 dev_priv->num_pipe = 3;
2120 else if (IS_MOBILE(dev) || !IS_GEN2(dev)) 2120 else if (IS_MOBILE(dev) || !IS_GEN2(dev))
2121 dev_priv->num_pipe = 2; 2121 dev_priv->num_pipe = 2;