1 files changed, 23 insertions, 14 deletions

diff --git a/src/radeon_output.c b/src/radeon_output.c
index 6ece28ad..fd94266c 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -658,7 +658,7 @@ radeon_mode_valid(xf86OutputPtr output, DisplayModePtr pMode)
 	    pMode->VDisplay > radeon_output->PanelYRes)
 	    return MODE_PANEL;
     }
-    
+
     return MODE_OK;
 }
 
@@ -668,28 +668,37 @@ radeon_mode_fixup(xf86OutputPtr output, DisplayModePtr mode,
 {
     RADEONOutputPrivatePtr radeon_output = output->driver_private;
 
+    if (radeon_output->MonType == MT_LCD) {
+	adjusted_mode->HTotal     = radeon_output->PanelXRes + radeon_output->HBlank;
+	adjusted_mode->HSyncStart = radeon_output->PanelXRes + radeon_output->HOverPlus;
+	adjusted_mode->HSyncEnd   = adjusted_mode->HSyncStart + radeon_output->HSyncWidth;
+	adjusted_mode->VTotal     = radeon_output->PanelYRes + radeon_output->VBlank;
+	adjusted_mode->VSyncStart = radeon_output->PanelYRes + radeon_output->VOverPlus;
+	adjusted_mode->VSyncEnd   = adjusted_mode->VSyncStart + radeon_output->VSyncWidth;
+	adjusted_mode->Clock      = radeon_output->DotClock;
+	adjusted_mode->Flags      = radeon_output->Flags;
+    }
+
     if ((radeon_output->MonType == MT_LCD || radeon_output->MonType == MT_DFP)
 	&& radeon_output->rmx_type != RMX_OFF) {
 	xf86CrtcPtr crtc = output->crtc;
 	RADEONCrtcPrivatePtr radeon_crtc = crtc->driver_private;
 
-	if ((mode->HDisplay < radeon_output->PanelXRes ||
-	     mode->VDisplay < radeon_output->PanelYRes) &&
-	    radeon_crtc->crtc_id == 0)
+	if (radeon_crtc->crtc_id == 0)
 	    adjusted_mode->Flags |= RADEON_USE_RMX;
 
 	if (adjusted_mode->Flags & RADEON_USE_RMX) {
 	    radeon_output->Flags |= RADEON_USE_RMX;
-	    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;
-	    }
+
+	    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;