xf86-video-intel: Branch 'exa' - src/i830_exa.c src/i830_memory.c

[Zhenyu Wang]

 src/i830_exa.c    |    2 +-
 src/i830_memory.c |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
diff-tree 011a1c99d49c1c69b5fa81ade6a2ed73e84276ae (from fcec956807038a2e90287850df8b4410b1f8b3c2)
Author: Wang Zhenyu <zhenyu.z.wang at intel.com>
Date:   Wed May 17 11:16:00 2006 +0800

    Fix memorySize to enable offscreen mem manage.

diff --git a/src/i830_exa.c b/src/i830_exa.c
index 59c2d51..6acc00c 100644
--- a/src/i830_exa.c
+++ b/src/i830_exa.c
@@ -369,7 +369,7 @@ I830EXAInit(ScreenPtr pScreen)
     pI830->EXADriverPtr->exa_minor = 0;
     pI830->EXADriverPtr->memoryBase = pI830->FbBase;
     pI830->EXADriverPtr->offScreenBase = pI830->Offscreen.Start;
-    pI830->EXADriverPtr->memorySize = pI830->Offscreen.Size;
+    pI830->EXADriverPtr->memorySize = pScrn->videoRam*1024;
 	   
     if(pI830->EXADriverPtr->memorySize >
        pI830->EXADriverPtr->offScreenBase)
diff --git a/src/i830_memory.c b/src/i830_memory.c
index 5fbc8cf..50bbde5 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -872,6 +872,10 @@ I830Allocate2DMemory(ScrnInfoPtr pScrn, 
 		       "offscreen memory.  Not enough VRAM?\n");
 	 }
 	 return FALSE;
+      } else {
+	    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Successful allocate "
+		       "offscreen memory at 0x%lx, size %d KB\n", 
+			pI830->Offscreen.Start, pI830->Offscreen.Size/1024);
       }
 #endif
    } else {