From: Jesse Barnes Date: Thu, 27 Mar 2014 18:56:08 +0000 (-0700) Subject: drm/i915/vlv: use W_SYNC_SHIFT for interlaced modes on VLV X-Git-Tag: v3.15-rc1~51^2~1^2~27 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=92b576e6e9b42bf8bd693ad6ed8d63dcfa6492ee;p=karo-tx-linux.git drm/i915/vlv: use W_SYNC_SHIFT for interlaced modes on VLV This makes HDMI testers happier on VLV platforms. It may be that we need it for any non-SVO platform, but I don't have any tests to back that up, so I'm leaving other pre-ILK platforms alone for now. Tested-by: "Clint Taylor " Signed-off-by: Jesse Barnes Reviewed-by: Ville Syrjälä Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=74964 Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 3a5fb1072a5c..564b6ab6ceb5 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5533,8 +5533,11 @@ static void i9xx_set_pipeconf(struct intel_crtc *intel_crtc) } } - if (!IS_GEN2(dev) && + if (IS_VALLEYVIEW(dev) && intel_crtc->config.adjusted_mode.flags & DRM_MODE_FLAG_INTERLACE) + pipeconf |= PIPECONF_INTERLACE_W_SYNC_SHIFT; + else if (!IS_GEN2(dev) && + intel_crtc->config.adjusted_mode.flags & DRM_MODE_FLAG_INTERLACE) pipeconf |= PIPECONF_INTERLACE_W_FIELD_INDICATION; else pipeconf |= PIPECONF_PROGRESSIVE;