xf86-video-intel: 2 commits - src/i830_driver.c src/i830_i2c.c

[Keith Packard]

 src/i830_driver.c |    2 +-
 src/i830_i2c.c    |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
diff-tree 44d1b544cec2e75735d2e27d66a9240317b962c2 (from a58befe9d243bd562cb4b2f08ec5c9f754148c20)
Author: Keith Packard <keithp at neko.keithp.com>
Date:   Sat Mar 17 17:15:43 2007 -0700

    Build fix for pre-XF86DRI_MM environments.
    
    Misplaced brace broke builds with older DRM libraries.

diff --git a/src/i830_driver.c b/src/i830_driver.c
index 5650faf..c6aea5c 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -1280,8 +1280,8 @@ I830PreInit(ScrnInfoPtr pScrn, int flags
 		    "\tfor the DRM memory manager.\n",
 		    pI830->mmSize);
       }
-   } 
 #endif
+   } 
    
 #endif
 
diff-tree a58befe9d243bd562cb4b2f08ec5c9f754148c20 (from 9d6d9ace4bd3180a4484321c3b96a83bc4adaf84)
Author: Keith Packard <keithp at neko.keithp.com>
Date:   Sat Mar 17 17:12:37 2007 -0700

    Remove extra (and incorrect) I2C ByteTimeout setting.
    
    Setting the value correctly and then immediately breaking it caused many I2C
    transactions to timeout with slow monitors. Oops.

diff --git a/src/i830_i2c.c b/src/i830_i2c.c
index 319e8da..08ff522 100644
--- a/src/i830_i2c.c
+++ b/src/i830_i2c.c
@@ -368,10 +368,14 @@ I830I2CInit(ScrnInfoPtr pScrn, I2CBusPtr
 
     /* Assume all busses are used for DDCish stuff */
     
+    /* 
+     * These were set incorrectly in the server pre-1.3, Having
+     * duplicate settings is sub-optimal, but this lets the driver
+     * work with older servers
+     */
     pI2CBus->ByteTimeout = 2200; /* VESA DDC spec 3 p. 43 (+10 %) */
     pI2CBus->StartTimeout = 550;
     pI2CBus->BitTimeout = 40;
-    pI2CBus->ByteTimeout = 40;
     pI2CBus->AcknTimeout = 40;
 
     if (!xf86I2CBusInit(pI2CBus))