xf86-video-intel: 2 commits - src/i830_driver.c src/i830_memory.c

[Alan Hourihane]

 src/i830_driver.c |    2 +-
 src/i830_memory.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
diff-tree 8b9d7a5f8560ee55ca5cb5376517a4246cd79fb9 (from parents)
Merge: 6500a3aa134e11a75b7ddaf7fff253003b223241 1e6e288b8826789f3b2520d12426ff7852a67ccd
Author: Alan Hourihane <alanh at fairlite.demon.co.uk>
Date:   Thu Sep 7 17:45:57 2006 +0100

    Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-intel

diff-tree 6500a3aa134e11a75b7ddaf7fff253003b223241 (from 1feb733eb8b09a8b07b7a6987add5149c53b0157)
Author: Alan Hourihane <alanh at fairlite.demon.co.uk>
Date:   Thu Sep 7 17:45:28 2006 +0100

    When in MergedFB mode, fix offscreen memory allocation.

diff --git a/src/i830_driver.c b/src/i830_driver.c
index a05fb17..99c35c0 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 f270a51..2d09b2d 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -783,7 +783,7 @@ I830Allocate2DMemory(ScrnInfoPtr pScrn, 
       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, 
       }
 
 #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);