xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_driver.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree 38515d402555eaa61c686d42973e59f659b07466 (from 0241cac643fa1c08a45ea44f5c670b290e760ad8)
Author: Alex Deucher <alex at botch2.(none)>
Date:   Sat Sep 15 11:39:47 2007 -0400

    RADEON: don't restore bios scratch regs
    
    Leave them as programmed by the bios
    fixes bug 12424

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 14d31bd..3f9a8fb 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -4189,10 +4189,10 @@ void RADEONRestoreLVDSRegisters(ScrnInfo
 
     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);  
 	OUTREG(RADEON_BIOS_4_SCRATCH, restore->bios_4_scratch);
 	OUTREG(RADEON_BIOS_5_SCRATCH, restore->bios_5_scratch);
-	OUTREG(RADEON_BIOS_6_SCRATCH, restore->bios_6_scratch);
+	OUTREG(RADEON_BIOS_6_SCRATCH, restore->bios_6_scratch);*/
     }
 
 }