xf86-video-intel: src/i830_crt.c

[Adam Jackson]

 src/i830_crt.c |   16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

New commits:
commit 8fd0e46571c7ba15c05f0a759113f8ca842c76a2
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Feb 23 15:44:26 2009 -0500

    Limit CRT DAC speed better.
    
    Verified against the public docs for i8xx parts, although not 9xx yet.

diff --git a/src/i830_crt.c b/src/i830_crt.c
index 605ecf9..984e77c 100644
--- a/src/i830_crt.c
+++ b/src/i830_crt.c
@@ -84,11 +84,23 @@ i830_crt_restore (xf86OutputPtr output)
 static int
 i830_crt_mode_valid(xf86OutputPtr output, DisplayModePtr pMode)
 {
+    ScrnInfoPtr pScrn = output->scrn;
+    I830Ptr	pI830 = I830Ptr(pScrn);
+    int		maxclock;
+
     if (pMode->Flags & V_DBLSCAN)
 	return MODE_NO_DBLESCAN;
 
-    if (pMode->Clock > 400000 || pMode->Clock < 25000)
-	return MODE_CLOCK_RANGE;
+    if (pMode->Clock < 25000)
+	return MODE_CLOCK_LOW;
+
+    if (!IS_I9XX(pI830))
+	maxclock = 350000;
+    else
+	maxclock = 400000;
+
+    if (pMode->Clock > maxclock)
+	return MODE_CLOCK_HIGH;
 
     return MODE_OK;
 }