diff options
| author | Eric Anholt <eric@anholt.net> | 2006-10-09 14:20:49 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2006-10-09 14:20:49 -0700 |
| commit | 2591c1fcf15608d96031be4760cf08534461ca34 (patch) | |
| tree | d4ee94c32c41dbbde47407216ed772d3eb4dc1ec /src/i830_lvds.c | |
| parent | 09e3d10b0ff69d180467fa9099d12da08e4f681b (diff) | |
Fix LVDS restore path, and move pipe assignment for outputs to the right place.
Diffstat (limited to 'src/i830_lvds.c')
| -rw-r--r-- | src/i830_lvds.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/i830_lvds.c b/src/i830_lvds.c index 23fc0a77..186d33b5 100644 --- a/src/i830_lvds.c +++ b/src/i830_lvds.c @@ -117,6 +117,10 @@ i830_lvds_restore(ScrnInfoPtr pScrn, I830OutputPtr output) OUTREG(PFIT_CONTROL, pI830->savePFIT_CONTROL); OUTREG(LVDS, pI830->saveLVDS); OUTREG(PP_CONTROL, pI830->savePP_CONTROL); + if (pI830->savePP_CONTROL & POWER_TARGET_ON) + i830SetLVDSPanelPower(pScrn, TRUE); + else + i830SetLVDSPanelPower(pScrn, FALSE); } static void @@ -159,6 +163,9 @@ i830_lvds_post_set_mode(ScrnInfoPtr pScrn, I830OutputPtr output, */ OUTREG(LVDS, INREG(LVDS) | LVDS_PORT_EN | LVDS_PIPEB_SELECT); + /* Re-enable the PLL */ + OUTREG(FPB0, INREG(FPB0) | DPLL_VCO_ENABLE); + i830SetLVDSPanelPower(pScrn, TRUE); } |