diff options
| author | David Airlie <airlied@asimov.stargames.com.au> | 2006-03-10 15:51:48 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-06-02 09:59:29 +1000 |
| commit | 371d08f61a4781df1d64ad8b4a6e7ce30e07cf89 (patch) | |
| tree | 054a4e25d46cb8703f074fdc224794cf73d872de /src/i830_driver.c | |
| parent | a89a2b7fe7585e757983e0f489eff2165bebab45 (diff) | |
make i915 mode setting work - not complete but better
Diffstat (limited to 'src/i830_driver.c')
| -rw-r--r-- | src/i830_driver.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c index 2946e72e..84ce65d7 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -345,7 +345,9 @@ I830DumpModeDebugInfo(ScrnInfoPtr pScrn) temp = INREG(DPLL_A); p2 = (temp >> DPLL_P2_SHIFT) & DPLL_P2_MASK; p1 = (temp >> DPLL_P1_SHIFT) & DPLL_P1_MASK; - p = (p1+2) * ( 1<< (p2 + 1)); + + p = ((1 << p1) * (p2 ? 10 : 5)); + // p = (p1+2) * ( 1<< (p2 + 1)); ErrorF("DPLL A is %08X: p1 is %d p2 is %d\n", temp, p1, p2); temp = INREG(FPA0); n = (temp >> FP_N_DIVISOR_SHIFT) & FP_DIVISOR_MASK; @@ -353,7 +355,7 @@ I830DumpModeDebugInfo(ScrnInfoPtr pScrn) m2 = (temp >> FP_M2_DIVISOR_SHIFT) & FP_DIVISOR_MASK; m = (5 * ((m1) + 2) + ((m2) + 2)); n += 2; - clock = ((PLL_REFCLK * m / n) / p); + clock = (((PLL_REFCLK * m) / n) / p); ErrorF("FPA0 is %08X N is %d m1 is %d m2 is %d\n", temp, n, m1, m2); ErrorF("m %d n %d p %d clock %d\n", m, n, p, clock); @@ -2209,12 +2211,19 @@ I830PreInitDDC(ScrnInfoPtr pScrn) return; } else { + pointer ret_p; pI830->num_dvos = 2; pI830->dvos[1].bus_type = I830_I2C_BUS_SDVO; /* i915 has sDVO */ pI830->ddc2 = I830I2CInit(pScrn, &pI830->dvos[1].pI2CBus, GPIOE, "SDVOCTRL"); if (pI830->ddc2 = FALSE) return; + + ret_p=I830SDVOInit(pI830->dvos[1].pI2CBus); + + + I830SDVOGetStatus(ret_p); + } pI830->ddc2 = TRUE; |