Bug#412449: X will only run at 640x480 with Radeon Mobility M6

[Michel Dänzer <daenzer@debian.org>]

On Sun, 2007-02-25 at 18:20 -0800, Daniel wrote: 
> Package: xserver-xorg
> Version: 7.1.0-12
> 
> 
> Since aptitude upgrading recently the Xorg server will only run at
> 640x480 mode.

[...]

> (--) RADEON(0): MergedFB: Virtual width 640
> (--) RADEON(0): MergedFB: Virtual height 480

Does this patch help?


-- 
Earthling Michel Dänzer           |          http://tungstengraphics.com
Libre software enthusiast         |          Debian, X and DRI developer

diff --git a/src/radeon_mergedfb.c b/src/radeon_mergedfb.c
index 820ba4b..a851f1c 100644
--- a/src/radeon_mergedfb.c
+++ b/src/radeon_mergedfb.c
@@ -581,8 +581,8 @@ RADEONRecalcDefaultVirtualSize(ScrnInfoPtr pScrn)
   	               info->CRT1XOffs = info->CRT2XOffs = 0;
   	               maxh -= (info->CRT1XOffs + info->CRT2XOffs);
   	}
-  	pScrn->virtualX = maxh;
-  	pScrn->displayWidth = maxh;
+  	pScrn->virtualX = MAX(pScrn->virtualX, maxh);
+  	pScrn->displayWidth = MAX(pScrn->displayWidth, maxh);
   	xf86DrvMsg(pScrn->scrnIndex, X_PROBED, str, "width", maxh);
     } else {
   	if(maxh < pScrn->display->virtualX) {
@@ -592,7 +592,7 @@ RADEONRecalcDefaultVirtualSize(ScrnInfoPtr pScrn)
     }
 
     if(!(pScrn->display->virtualY)) {
-        pScrn->virtualY = maxv;
+	pScrn->virtualY = MAX(pScrn->virtualY, maxv);
 	xf86DrvMsg(pScrn->scrnIndex, X_PROBED, str, "height", maxv);
     } else {
 	if(maxv < pScrn->display->virtualY) {