xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/legacy_output.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a38a903debc0a50dbc73f59dc2741bbea76d2bd9
Author: Alex Deucher <alex at t41p.hsd1.va.comcast.net>
Date:   Fri Feb 1 02:59:07 2008 -0500

    RADEON: don't restore LVDS_PLL_CNTL for now
    
    seems to cause problems with resume for some users.
    this needs further investigation.
    see bug 12596

diff --git a/src/legacy_output.c b/src/legacy_output.c
index c2faa47..8ae21b9 100644
--- a/src/legacy_output.c
+++ b/src/legacy_output.c
@@ -150,7 +150,7 @@ RADEONRestoreLVDSRegisters(ScrnInfoPtr pScrn, RADEONSavePtr restore)
 
     if (info->IsMobility) {
 	OUTREG(RADEON_LVDS_GEN_CNTL,  restore->lvds_gen_cntl);
-	OUTREG(RADEON_LVDS_PLL_CNTL,  restore->lvds_pll_cntl);
+	/*OUTREG(RADEON_LVDS_PLL_CNTL,  restore->lvds_pll_cntl);*/
 
 	if (info->ChipFamily == CHIP_FAMILY_RV410) {
 	    OUTREG(RADEON_CLOCK_CNTL_INDEX, 0);