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

[Zhenyu Wang]

 src/Makefile.am    |    2 +-
 src/i830_display.c |    6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit f47486fab3dffcbb03e7ad89f777abba1e887299
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date:   Fri Apr 11 10:12:40 2008 +0800

    remove '#line NUM ...' in macro process
    
    intel-gen4asm doesn't allow '#' line

diff --git a/src/Makefile.am b/src/Makefile.am
index 91f5995..dbf9979 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -186,7 +186,7 @@ if HAVE_GEN4ASM
 
 SUFFIXES = .g4a .g4b
 .g4a.g4b:
-	m4 -s $*.g4a > $*.g4m && intel-gen4asm -o $@ $*.g4m && rm $*.g4m
+	m4 $*.g4a > $*.g4m && intel-gen4asm -o $@ $*.g4m && rm $*.g4m
 
 $(INTEL_G4B): $(INTEL_G4I)
 
commit 5c9cde37e769287fb7bf4e08c3600a33c2e92dce
Author: Hong Liu <hong.liu at intel.com>
Date:   Fri Apr 11 09:54:34 2008 +0800

    Bug #14935: Fix i9xx reference clock for spread spectrum.

diff --git a/src/i830_display.c b/src/i830_display.c
index 6ac9f9e..1122721 100644
--- a/src/i830_display.c
+++ b/src/i830_display.c
@@ -1718,8 +1718,10 @@ i830_crtc_clock_get(ScrnInfoPtr pScrn, xf86CrtcPtr crtc)
 	    return 0;
 	}
 
-	/* XXX: Handle the 100Mhz refclk */
-	i9xx_clock(96000, &clock);
+	if ((dpll & PLL_REF_INPUT_MASK) == PLLB_REF_INPUT_SPREADSPECTRUMIN)
+	    i9xx_clock(100000, &clock);
+	else
+	    i9xx_clock(96000, &clock);
     } else {
 	Bool is_lvds = (pipe == 1) && (INREG(LVDS) & LVDS_PORT_EN);