diff options
| author | Wang Zhenyu <zhenyu.z.wang@intel.com> | 2006-09-25 14:15:21 +0800 |
|---|---|---|
| committer | Wang Zhenyu <zhenyu.z.wang@intel.com> | 2006-09-25 14:15:21 +0800 |
| commit | f272f0d811f9ee059e8f8617a516e6c8bff917a1 (patch) | |
| tree | c3d8966fe559c7d780cd2ce3b0b7a401705ecbd7 /src/i830_memory.c | |
| parent | ff202f8e2ae4117b464c94047001023d5d0531cc (diff) | |
| parent | b3ddcf3348365873aed4a2b8b2750b330fb4cf26 (diff) | |
Merge branch 'master' into exa
Diffstat (limited to 'src/i830_memory.c')
| -rw-r--r-- | src/i830_memory.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/i830_memory.c b/src/i830_memory.c index 88dc5acb..e3307d6f 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); |