diff options
| author | Eric Anholt <eric@anholt.net> | 2007-03-20 23:32:19 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-03-20 23:32:19 -0700 |
| commit | a50009604152bf9237c40bd098b3b1da3d018929 (patch) | |
| tree | 69e7bdec353fd1448846416cbebe5f2c7441a4ba /src/i830_lvds.c | |
| parent | 0a612e7115ff993bb8e9a00df13c0b0d20122fd6 (diff) | |
| parent | 223944878cf38f86580df5a7d3102d86cfc061b9 (diff) | |
Merge branch 'master' into crestline
Conflicts:
src/i810_reg.h
src/i830_display.c
Diffstat (limited to 'src/i830_lvds.c')
| -rw-r--r-- | src/i830_lvds.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/i830_lvds.c b/src/i830_lvds.c index 23b61f28..7e5ce67a 100644 --- a/src/i830_lvds.c +++ b/src/i830_lvds.c @@ -98,7 +98,7 @@ i830_lvds_dpms (xf86OutputPtr output, int mode) else i830SetLVDSPanelPower(pScrn, FALSE); - /* XXX: We never power down the LVDS pair. */ + /* XXX: We never power down the LVDS pairs. */ } static void @@ -109,7 +109,6 @@ i830_lvds_save (xf86OutputPtr output) pI830->savePP_ON = INREG(LVDSPP_ON); pI830->savePP_OFF = INREG(LVDSPP_OFF); - pI830->saveLVDS = INREG(LVDS); pI830->savePP_CONTROL = INREG(PP_CONTROL); pI830->savePP_CYCLE = INREG(PP_CYCLE); pI830->saveBLC_PWM_CTL = INREG(BLC_PWM_CTL); @@ -133,7 +132,6 @@ i830_lvds_restore(xf86OutputPtr output) OUTREG(LVDSPP_ON, pI830->savePP_ON); OUTREG(LVDSPP_OFF, pI830->savePP_OFF); OUTREG(PP_CYCLE, pI830->savePP_CYCLE); - OUTREG(LVDS, pI830->saveLVDS); OUTREG(PP_CONTROL, pI830->savePP_CONTROL); if (pI830->savePP_CONTROL & POWER_TARGET_ON) i830SetLVDSPanelPower(pScrn, TRUE); @@ -204,11 +202,6 @@ i830_lvds_mode_fixup(xf86OutputPtr output, DisplayModePtr mode, xf86SetModeCrtc(adjusted_mode, INTERLACE_HALVE_V); } - /* XXX: if we don't have BIOS fixed timings (or we have - * a preferred mode from DDC, probably), we should use the - * DDC mode as the fixed timing. - */ - /* XXX: It would be nice to support lower refresh rates on the * panels to reduce power consumption, and perhaps match the * user's requested refresh rate. |