xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit 3af671f5963810dbfd63abc9889b1d46b68f404c
Author: Alex Deucher <alex at botch2.(none)>
Date:   Wed Jan 9 11:30:25 2008 -0500

    RADEON: restore FP2 regs before external encoders
    
    This may fix krh's dvi problem

diff --git a/src/legacy_output.c b/src/legacy_output.c
index 4b7fded..595b243 100644
--- a/src/legacy_output.c
+++ b/src/legacy_output.c
@@ -1230,11 +1230,11 @@ legacy_output_mode_set(xf86OutputPtr output, DisplayModePtr mode,
 	    RADEONRestoreFPRegisters(pScrn, info->ModeReg);
 	} else {
 	    ErrorF("restore FP2\n");
+	    RADEONRestoreFP2Registers(pScrn, info->ModeReg);
 	    if (info->IsAtomBios)
 		atombios_external_tmds_setup(output, mode);
 	    else
 		RADEONRestoreDVOChip(pScrn, output);
-	    RADEONRestoreFP2Registers(pScrn, info->ModeReg);
 	}
 	break;
     case MT_STV: