From 6d9c02d58eae1966e8fa8d7d305849c6e57434ad Mon Sep 17 00:00:00 2001
From: Alex Deucher <agd5f@yahoo.com>
Date: Thu, 30 Jun 2005 02:02:10 +0000
Subject: [PATCH] - small mergedfb fix from Thomas Winischhofer

---
 src/radeon_mergedfb.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/radeon_mergedfb.c b/src/radeon_mergedfb.c
index 91934768..25088c38 100644
--- a/src/radeon_mergedfb.c
+++ b/src/radeon_mergedfb.c
@@ -706,24 +706,23 @@ RADEONUpdateXineramaScreenInfo(ScrnInfoPtr pScrn1)
     }
 
     if((usenonrect) && (info->CRT2Position != radeonClone) && info->maxCRT1_X1) {
-#if 0
      switch(info->CRT2Position) {
        case radeonLeftOf:
        case radeonRightOf:
-	  if((info->maxCRT1_Y1 != realvirtY) && (info->maxCRT2_Y1 != realvirtY)) {
+	  if((info->maxCRT1_Y1 != realvirtY) && (info->maxCRT2_Y2 != realvirtY)) {
 	     usenonrect = FALSE;
 	  }
 	  break;
        case radeonAbove:
        case radeonBelow:
-	  if((info->maxCRT1_X1 != realvirtX) && (info->maxCRT2_X1 != realvirtX)) {
+	  if((info->maxCRT1_X1 != realvirtX) && (info->maxCRT2_X2 != realvirtX)) {
 	     usenonrect = FALSE;
 	  }
 	  break;
        case radeonClone:
 	  break;
        }
-#endif
+
        if(infochanged && !usenonrect) {
 	  xf86DrvMsg(pScrn1->scrnIndex, X_INFO,
 			"Virtual screen size does not match maximum display modes...\n");