xf86-video-intel: src/i830_tv.c

[Zhenyu Wang]

 src/i830_tv.c |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 65cd0fbb018b2c18f1571dc0924c7d92eaf794ad
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date:   Tue Nov 11 09:36:50 2008 +0800

    TV: fix contrast and saturation for 915/945G
    
    915/945G uses exponent-mantissa format instead of
    fixed-point format on 965G.

diff --git a/src/i830_tv.c b/src/i830_tv.c
index 5c6a031..09a46e9 100644
--- a/src/i830_tv.c
+++ b/src/i830_tv.c
@@ -1180,9 +1180,14 @@ i830_tv_mode_set(xf86OutputPtr output, DisplayModePtr mode,
 	    (i830_float_to_csc(color_conversion->bv) << 16) |
 	    (i830_float_to_luma(color_conversion->av)));
 
-    /* 2.6 fixed point value for contrast and saturation modifier,
-       use 1 as default */
-    OUTREG(TV_CLR_KNOBS, 0x00404000);
+    if (IS_I965G(pI830)) {
+	/* 2.6 fixed point value for contrast and saturation modifier,
+	   use 1 as default */
+	OUTREG(TV_CLR_KNOBS, 0x00404000);
+    } else {
+	/* 915/945 uses 2 bits exponent and 6 bits mantissa format */
+	OUTREG(TV_CLR_KNOBS, 0x00606000);
+    }
     OUTREG(TV_CLR_LEVEL, ((video_levels->black << TV_BLACK_LEVEL_SHIFT) |
 		(video_levels->blank << TV_BLANK_LEVEL_SHIFT)));
     {