xf86-video-intel: 2 commits - .gitignore src/i830_display.c

[Eric Anholt]

 .gitignore         |    2 ++
 src/i830_display.c |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
diff-tree 1c809f92467f97b098bcc89d66e60f6f88d9bade (from f7befe50af4c13554d1f7aee6b05848ac312411b)
Author: Eric Anholt <eric at anholt.net>
Date:   Mon Mar 26 13:03:28 2007 -0700

    Update .gitignore.

diff --git a/.gitignore b/.gitignore
index cb52e9f..8109409 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@ config.log
 config.status
 config.sub
 configure
+configure.lineno
 depcomp
 install-sh
 libtool
@@ -22,3 +23,4 @@ ltmain.sh
 missing
 stamp-h1
 i810.4
+intel.4
diff-tree f7befe50af4c13554d1f7aee6b05848ac312411b (from 827dc457a4fd0b97c95ec696ec9c3cd2f4a4becb)
Author: Eric Anholt <eric at anholt.net>
Date:   Mon Mar 26 13:01:11 2007 -0700

    Power on the LVDS B-channel pairs only when we've chosen dual-channel mode.
    
    It was basing off of the clock rate, but we have an override to use the
    existing dual channel state when we can detect it, so the two settings were
    conflicting.

diff --git a/src/i830_display.c b/src/i830_display.c
index d55e0a6..48ea2bc 100644
--- a/src/i830_display.c
+++ b/src/i830_display.c
@@ -916,7 +916,7 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, Dis
 	/* Set the B0-B3 data pairs corresponding to whether we're going to
 	 * set the DPLLs for dual-channel mode or not.
 	 */
-	if (adjusted_mode->Clock >= I9XX_P2_LVDS_SLOW_LIMIT)
+	if (clock.p2 == 7)
 	    lvds |= LVDS_B0B3_POWER_UP | LVDS_CLKB_POWER_UP;
 	else
 	    lvds &= ~(LVDS_B0B3_POWER_UP | LVDS_CLKB_POWER_UP);