drm/i915: properly handle interlaced bit for sdvo dtd conversion

commit 59d92bfa5f0cdf57f82f5181b0ad6af75c3fdf41 upstream.

We've simply ignored this, which isn't too great. With this, interlaced
1080i works on my HDMI screen connected through sdvo. For no apparent
reason anything else still doesn't work as it should.

While at it, give these magic numbers in the dtd proper names and
add a comment that they match with EDID detailed timings.

v2: Actually use the right bit for interlaced.

Tested-by: Peter Ross <pross@xvid.org>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 8 insertions, 4 deletions

diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 06bc46ee22f..c9010607474 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -762,10 +762,12 @@ static void intel_sdvo_get_dtd_from_mode(struct intel_sdvo_dtd *dtd,
                 ((v_sync_len & 0x30) >> 4);
 
         dtd->part2.dtd_flags = 0x18;
+        if (mode->flags & DRM_MODE_FLAG_INTERLACE)
+                dtd->part2.dtd_flags |= DTD_FLAG_INTERLACE;
         if (mode->flags & DRM_MODE_FLAG_PHSYNC)
-                dtd->part2.dtd_flags |= 0x2;
+                dtd->part2.dtd_flags |= DTD_FLAG_HSYNC_POSITIVE;
         if (mode->flags & DRM_MODE_FLAG_PVSYNC)
-                dtd->part2.dtd_flags |= 0x4;
+                dtd->part2.dtd_flags |= DTD_FLAG_VSYNC_POSITIVE;
 
         dtd->part2.sdvo_flags = 0;
         dtd->part2.v_sync_off_high = v_sync_offset & 0xc0;
@@ -799,9 +801,11 @@ static void intel_sdvo_get_mode_from_dtd(struct drm_display_mode * mode,
         mode->clock = dtd->part1.clock * 10;
 
         mode->flags &= ~(DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC);
-        if (dtd->part2.dtd_flags & 0x2)
+        if (dtd->part2.dtd_flags & DTD_FLAG_INTERLACE)
+                mode->flags |= DRM_MODE_FLAG_INTERLACE;
+        if (dtd->part2.dtd_flags & DTD_FLAG_HSYNC_POSITIVE)
                 mode->flags |= DRM_MODE_FLAG_PHSYNC;
-        if (dtd->part2.dtd_flags & 0x4)
+        if (dtd->part2.dtd_flags & DTD_FLAG_VSYNC_POSITIVE)
                 mode->flags |= DRM_MODE_FLAG_PVSYNC;
 }