Commit efc2cfff authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter

drm/i915: Fix the interlace mode selection for gmch platforms

PIPECONF_INTERLACE_W_FIELD_INDICATION is only meant to be used for sdvo
since it implies a slightly weird vsync shift of htotal/2. For everything
else we should use PIPECONF_INTERLACE_W_SYNC_SHIFT and let the value in
the VSYNCSHIFT register take effect.

The only exception is gen3 simply because VSYNCSHIFT didn't exist yet.
Gen2 doesn't support interlaced modes at all, so we can drop the
explicit gen2 checks.
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 609aeaca
...@@ -5535,13 +5535,13 @@ static void i9xx_set_pipeconf(struct intel_crtc *intel_crtc) ...@@ -5535,13 +5535,13 @@ static void i9xx_set_pipeconf(struct intel_crtc *intel_crtc)
} }
} }
if (IS_VALLEYVIEW(dev) && if (intel_crtc->config.adjusted_mode.flags & DRM_MODE_FLAG_INTERLACE) {
intel_crtc->config.adjusted_mode.flags & DRM_MODE_FLAG_INTERLACE) if (INTEL_INFO(dev)->gen < 4 ||
pipeconf |= PIPECONF_INTERLACE_W_SYNC_SHIFT; intel_pipe_has_type(&intel_crtc->base, INTEL_OUTPUT_SDVO))
else if (!IS_GEN2(dev) && pipeconf |= PIPECONF_INTERLACE_W_FIELD_INDICATION;
intel_crtc->config.adjusted_mode.flags & DRM_MODE_FLAG_INTERLACE) else
pipeconf |= PIPECONF_INTERLACE_W_FIELD_INDICATION; pipeconf |= PIPECONF_INTERLACE_W_SYNC_SHIFT;
else } else
pipeconf |= PIPECONF_PROGRESSIVE; pipeconf |= PIPECONF_PROGRESSIVE;
if (IS_VALLEYVIEW(dev) && intel_crtc->config.limited_color_range) if (IS_VALLEYVIEW(dev) && intel_crtc->config.limited_color_range)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment