xf86-video-intel: src/i830_sdvo.c

[Zhenyu Wang]

 src/i830_sdvo.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 2fcf4fcccfe7cfa1425985d21a144137eca07f4e
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date:   Tue Mar 10 14:21:36 2009 +0800

    SDVO: fix pixel multiplier setting for TV
    
    We should use preferred input timing's clock for correct
    pixel multiplier setting, otherwise we might get inconsistent
    multiplier setting on pipe and SDVO device for some modes.

diff --git a/src/i830_sdvo.c b/src/i830_sdvo.c
index 1f2578e..baba007 100644
--- a/src/i830_sdvo.c
+++ b/src/i830_sdvo.c
@@ -1039,8 +1039,13 @@ i830_sdvo_mode_fixup(xf86OutputPtr output, DisplayModePtr mode,
 
 	    ErrorF("input modeline:\n");
 	    xf86PrintModeline(0, adjusted_mode);
+
+	    /* adjust origin mode's clock for current input,
+	       for correct pixel mulitiplier setting. */
+	    mode->Clock = adjusted_mode->Clock;
+
 	    /* Clock range is required to be in 100-200Mhz */
-	    adjusted_mode->Clock *= i830_sdvo_get_pixel_multiplier(adjusted_mode);
+	    adjusted_mode->Clock *= i830_sdvo_get_pixel_multiplier(mode);
 	} else {
 	    return FALSE;
 	}