diff options
| author | Keith Packard <keithp@guitar.keithp.com> | 2006-12-21 23:34:30 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@guitar.keithp.com> | 2006-12-21 23:34:30 -0800 |
| commit | 1e9105395a7900521206b28bae4bb4f85669a0cd (patch) | |
| tree | 2466163541a13b000ec9dc5991acc8f5762868f7 | |
| parent | df9ecf8ab93f0aeffde11d438513d41220ba75cb (diff) | |
| parent | c237e930615f1b048895efe988d28503f5d67c37 (diff) | |
Merge branch 'modesetting-origin' into modesetting
| -rw-r--r-- | src/i830_i2c.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/i830_i2c.c b/src/i830_i2c.c index 8fd12ea9..450f9de0 100644 --- a/src/i830_i2c.c +++ b/src/i830_i2c.c @@ -365,6 +365,14 @@ I830I2CInit(ScrnInfoPtr pScrn, I2CBusPtr *bus_ptr, int i2c_reg, char *name) #endif pI2CBus->DriverPrivate.uval = i2c_reg; + /* Assume all busses are used for DDCish stuff */ + + 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)) return FALSE; |