Merge branch 'modesetting-origin' into modesetting

This commit is contained in:
Keith Packard 2006-12-21 23:34:30 -08:00
commit 1e9105395a
1 changed files with 8 additions and 0 deletions

View File

@ -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;