diff options
| author | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2006-09-07 17:45:28 +0100 |
|---|---|---|
| committer | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2006-09-07 17:45:28 +0100 |
| commit | 6500a3aa134e11a75b7ddaf7fff253003b223241 (patch) | |
| tree | 1ef7cc1ae80235f1c68b73e5b9eed3a648260dda /src | |
| parent | 1feb733eb8b09a8b07b7a6987add5149c53b0157 (diff) | |
When in MergedFB mode, fix offscreen memory allocation.
Diffstat (limited to 'src')
| -rw-r--r-- | src/i830_driver.c | 2 | ||||
| -rw-r--r-- | src/i830_memory.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c index a05fb178..99c35c0d 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -6926,7 +6926,7 @@ I830InitFBManager( ScreenBox.x1 = 0; ScreenBox.y1 = 0; ScreenBox.x2 = pScrn->displayWidth; - if (pScrn->virtualX > pScrn->virtualY) + if (!pI830->MergedFB && pScrn->virtualX > pScrn->virtualY) ScreenBox.y2 = pScrn->virtualX; else ScreenBox.y2 = pScrn->virtualY; diff --git a/src/i830_memory.c b/src/i830_memory.c index f270a51e..2d09b2d4 100644 --- a/src/i830_memory.c +++ b/src/i830_memory.c @@ -783,7 +783,7 @@ I830Allocate2DMemory(ScrnInfoPtr pScrn, const int flags) pI830->FbMemBox.x1 = 0; pI830->FbMemBox.x2 = pScrn->displayWidth; pI830->FbMemBox.y1 = 0; - if (pScrn->virtualX > pScrn->virtualY) + if (!pI830->MergedFB && pScrn->virtualX > pScrn->virtualY) pI830->FbMemBox.y2 = pScrn->virtualX; else pI830->FbMemBox.y2 = pScrn->virtualY; @@ -855,7 +855,7 @@ I830Allocate2DMemory(ScrnInfoPtr pScrn, const int flags) } #if 1 /* ROTATION */ - if (pScrn->virtualX > pScrn->virtualY) + if (!pI830->MergedFB && pScrn->virtualX > pScrn->virtualY) size = lineSize * (pScrn->virtualX + cacheLines); else size = lineSize * (pScrn->virtualY + cacheLines); |