diff options
| author | Michel Dänzer <michel@tungstengraphics.com> | 2007-04-04 09:47:07 +0200 |
|---|---|---|
| committer | Michel Dänzer <michel@tungstengraphics.com> | 2007-04-04 09:47:07 +0200 |
| commit | 3a8190ccc79969925257e7b980b78d79053d208d (patch) | |
| tree | cd437dc6331a94e38c0c15642a168aac135e4176 /src | |
| parent | 9b1e97284ce185d358ca756a235d2cee346fa53f (diff) | |
radeon: Don't shrink virtual size based on secondary modes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/radeon_mergedfb.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/radeon_mergedfb.c b/src/radeon_mergedfb.c index 820ba4ba..6a7745e4 100644 --- a/src/radeon_mergedfb.c +++ b/src/radeon_mergedfb.c @@ -581,8 +581,10 @@ RADEONRecalcDefaultVirtualSize(ScrnInfoPtr pScrn) info->CRT1XOffs = info->CRT2XOffs = 0; maxh -= (info->CRT1XOffs + info->CRT2XOffs); } - pScrn->virtualX = maxh; - pScrn->displayWidth = maxh; + if (maxh > pScrn->virtualX) + pScrn->virtualX = maxh; + if (maxh > pScrn->displayWidth) + pScrn->displayWidth = maxh; xf86DrvMsg(pScrn->scrnIndex, X_PROBED, str, "width", maxh); } else { if(maxh < pScrn->display->virtualX) { @@ -592,7 +594,8 @@ RADEONRecalcDefaultVirtualSize(ScrnInfoPtr pScrn) } if(!(pScrn->display->virtualY)) { - pScrn->virtualY = maxv; + if (maxv > pScrn->virtualY) + pScrn->virtualY = maxv; xf86DrvMsg(pScrn->scrnIndex, X_PROBED, str, "height", maxv); } else { if(maxv < pScrn->display->virtualY) { |