diff options
| author | Eugeni Dodonov <eugeni.dodonov@intel.com> | 2012-04-13 17:08:45 -0300 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-04-17 12:13:08 +0200 |
| commit | c51ed787f6c49de7c2180c0f78e1d0e1360c7e86 (patch) | |
| tree | 21298e08d5dccd32ed77699a18787720939b6afe | |
| parent | 246bdbeb0f0fb14c4c085b6ed7edbab11afccd33 (diff) | |
| download | op-kernel-dev-c51ed787f6c49de7c2180c0f78e1d0e1360c7e86.zip op-kernel-dev-c51ed787f6c49de7c2180c0f78e1d0e1360c7e86.tar.gz | |
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>
| -rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 2 |
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 333b746..a813f65 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) 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; |
