diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2011-09-02 19:54:37 (GMT) |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-10-20 22:26:42 (GMT) |
| commit | 27f8227b1e2b326a9a0995dd9c1f14893c61ee01 (patch) | |
| tree | 2158d909c7e960fc84c97b79a5c1069b828e3512 /drivers/gpu/drm/i915/i915_dma.c | |
| parent | 4c609cb890b13ef58e0c0cdd238993484e1b9b83 (diff) | |
| download | linux-fsl-qoriq-27f8227b1e2b326a9a0995dd9c1f14893c61ee01.tar.xz | |
drm/i915: support 3 pipes on IVB+
Well almost anyway. IVB has 3 planes, pipes, transcoders, and FDI
interfaces, but only 2 pipe PLLs. So two of the pipes must use the same
pipe timings (e.g. 2 DP plus one other, or two HDMI with the same mode
and one other, etc.).
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Tested-By: Eugeni Dodonov <eugeni.dodonov@intel.com>
Reviewed-By: Eugeni Dodonov <eugeni.dodonov@intel.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index d76da38..2eac955 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -2035,7 +2035,9 @@ 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_MOBILE(dev) || !IS_GEN2(dev)) + if (IS_IVYBRIDGE(dev)) + dev_priv->num_pipe = 3; + else if (IS_MOBILE(dev) || !IS_GEN2(dev)) dev_priv->num_pipe = 2; else dev_priv->num_pipe = 1; |