aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_display.c
diff options
context:
space:
mode:
authorPaulo Zanoni <paulo.r.zanoni@intel.com>2012-02-14 14:07:09 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-02-14 14:32:29 -0500
commit7c26e5c6edaec70f12984f7a3020864cc21e6fec (patch)
tree0221d3a6583684c447e516cf356361a721246ac9 /drivers/gpu/drm/i915/intel_display.c
parent8a8ed1f5143b3df312e436ab15290e4a7ca6a559 (diff)
drm/i915: add missing SDVO bits for interlaced modes on ILK
This was pointed by Jesse Barnes. The code now seems to follow the specification but I don't have an SDVO device to really test this. Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index ba287cab45f0..a12159e53aef 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1267,6 +1267,7 @@ static void intel_enable_transcoder(struct drm_i915_private *dev_priv,
1267{ 1267{
1268 int reg; 1268 int reg;
1269 u32 val, pipeconf_val; 1269 u32 val, pipeconf_val;
1270 struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe];
1270 1271
1271 /* PCH only available on ILK+ */ 1272 /* PCH only available on ILK+ */
1272 BUG_ON(dev_priv->info->gen < 5); 1273 BUG_ON(dev_priv->info->gen < 5);
@@ -1293,7 +1294,11 @@ static void intel_enable_transcoder(struct drm_i915_private *dev_priv,
1293 1294
1294 val &= ~TRANS_INTERLACE_MASK; 1295 val &= ~TRANS_INTERLACE_MASK;
1295 if ((pipeconf_val & PIPECONF_INTERLACE_MASK) == PIPECONF_INTERLACED_ILK) 1296 if ((pipeconf_val & PIPECONF_INTERLACE_MASK) == PIPECONF_INTERLACED_ILK)
1296 val |= TRANS_INTERLACED; 1297 if (HAS_PCH_IBX(dev_priv->dev) &&
1298 intel_pipe_has_type(crtc, INTEL_OUTPUT_SDVO))
1299 val |= TRANS_LEGACY_INTERLACED_ILK;
1300 else
1301 val |= TRANS_INTERLACED;
1297 else 1302 else
1298 val |= TRANS_PROGRESSIVE; 1303 val |= TRANS_PROGRESSIVE;
1299 1304