diff options
| author | Dave Airlie <airlied@airlied-rhel5.(none)> | 2010-04-21 11:06:12 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@airlied-rhel5.(none)> | 2010-04-21 11:06:12 +1000 |
| commit | 522b5475afd40ad1a3cdf5d50b7ae897dfda8b3c (patch) | |
| tree | 5faf10ca6a9b91acbd6d9c8e07472ad466d1fc15 | |
| parent | 8675aa788ba555aeb41c64080ca3a642ddb4b087 (diff) | |
intel-2.2.1-vga-dpll-init.patch
| -rw-r--r-- | src/i830_display.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/i830_display.c b/src/i830_display.c index 41f43987..598c59fe 100644 --- a/src/i830_display.c +++ b/src/i830_display.c @@ -1205,6 +1205,14 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode, i830PrintPll("chosen", &clock); } + if (dpll & DPLL_VCO_ENABLE) + { + OUTREG(fp_reg, fp); + OUTREG(dpll_reg, dpll & ~DPLL_VCO_ENABLE); + POSTING_READ(dpll_reg); + usleep(150); + } + /* The LVDS pin pair needs to be on before the DPLLs are enabled. * This is an exception to the general rule that mode_set doesn't turn * things on. @@ -1213,14 +1221,6 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode, { CARD32 lvds = INREG(LVDS); - if (dpll & DPLL_VCO_ENABLE) - { - OUTREG(fp_reg, fp); - OUTREG(dpll_reg, dpll & ~DPLL_VCO_ENABLE); - POSTING_READ(dpll_reg); - usleep(150); - } - lvds |= LVDS_PORT_EN | LVDS_A0A2_CLKA_POWER_UP | LVDS_PIPEB_SELECT; /* Set the B0-B3 data pairs corresponding to whether we're going to * set the DPLLs for dual-channel mode or not. |