xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_output.c |   18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

New commits:
diff-tree 6c482e453bc8156886294d0c1b8f3f1b3dcf4b36 (from 9109e62e3be7f96b41b534ab517fdf1baf458806)
Author: Alex Deucher <alex at botch2.(none)>
Date:   Sat Sep 22 15:11:20 2007 -0400

    RADEON: Fix RMX on LVDS
    
    LVDS + RMX doesn't seem to like having the crtc values tweaked.

diff --git a/src/radeon_output.c b/src/radeon_output.c
index d2e2363..3e58d41 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -679,15 +679,17 @@ radeon_mode_fixup(xf86OutputPtr output, 
 	    adjusted_mode->Flags |= RADEON_USE_RMX;
 
 	if (adjusted_mode->Flags & RADEON_USE_RMX) {
-	    adjusted_mode->CrtcHTotal     = mode->CrtcHDisplay + radeon_output->HBlank;
-	    adjusted_mode->CrtcHSyncStart = mode->CrtcHDisplay + radeon_output->HOverPlus;
-	    adjusted_mode->CrtcHSyncEnd   = mode->CrtcHSyncStart + radeon_output->HSyncWidth;
-	    adjusted_mode->CrtcVTotal     = mode->CrtcVDisplay + radeon_output->VBlank;
-	    adjusted_mode->CrtcVSyncStart = mode->CrtcVDisplay + radeon_output->VOverPlus;
-	    adjusted_mode->CrtcVSyncEnd   = mode->CrtcVSyncStart + radeon_output->VSyncWidth;
-	    adjusted_mode->Clock          = radeon_output->DotClock;
 	    radeon_output->Flags |= RADEON_USE_RMX;
-	    adjusted_mode->Flags          = radeon_output->Flags;
+	    if (radeon_output->MonType == MT_DFP) {
+		adjusted_mode->CrtcHTotal     = mode->CrtcHDisplay + radeon_output->HBlank;
+		adjusted_mode->CrtcHSyncStart = mode->CrtcHDisplay + radeon_output->HOverPlus;
+		adjusted_mode->CrtcHSyncEnd   = mode->CrtcHSyncStart + radeon_output->HSyncWidth;
+		adjusted_mode->CrtcVTotal     = mode->CrtcVDisplay + radeon_output->VBlank;
+		adjusted_mode->CrtcVSyncStart = mode->CrtcVDisplay + radeon_output->VOverPlus;
+		adjusted_mode->CrtcVSyncEnd   = mode->CrtcVSyncStart + radeon_output->VSyncWidth;
+		adjusted_mode->Clock          = radeon_output->DotClock;
+		adjusted_mode->Flags          = radeon_output->Flags;
+	    }
 	} else
 	    radeon_output->Flags &= ~RADEON_USE_RMX;