[pkg-fso-commits] [SCM] xf86-video-glamo, SMedia Glamo video driver for X.Org branch, master, updated. upstream/0.0.0+20090224.git703acea1-15-g25c4b0e

[Lars-Peter Clausen]

The following commit has been merged in the master branch:
commit 16a993d8b17ef623a21b003f6f08adb86c76de77
Author: Lars-Peter Clausen <lars at metafoo.de>
Date:   Sun Apr 26 21:20:54 2009 +0200

    Fix size/offset bugs in the new memory management code.

diff --git a/src/glamo-draw.c b/src/glamo-draw.c
index 78fcbf2..d0590d3 100644
--- a/src/glamo-draw.c
+++ b/src/glamo-draw.c
@@ -241,11 +241,11 @@ GLAMODrawExaInit(ScrnInfoPtr pScrn, size_t mem_start, size_t mem_size)
     if(!exa)
         return FALSE;
 
-    pGlamo->exa->memoryBase = pGlamo->fbstart + mem_start;
-    pGlamo->exa->memorySize = mem_size;
+    pGlamo->exa->memoryBase = pGlamo->fbstart;
+    pGlamo->exa->memorySize = mem_size + mem_start;
     /* TODO: Initalize offScreenBase based on the current screen resolution
      * (width*height*depth) */
-    pGlamo->exa->offScreenBase = 480 * 640 * 2;
+    pGlamo->exa->offScreenBase = mem_start;
 
 	exa->exa_major = EXA_VERSION_MAJOR;
 	exa->exa_minor = EXA_VERSION_MINOR;
diff --git a/src/glamo-driver.c b/src/glamo-driver.c
index ac3db86..d6d9624 100644
--- a/src/glamo-driver.c
+++ b/src/glamo-driver.c
@@ -522,8 +522,8 @@ GlamoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
     GlamoPtr pGlamo = GlamoPTR(pScrn);
     VisualPtr visual;
     int ret, flags;
-    size_t mem_start = 0;
-    size_t mem_size = 1024 * 1024 * 4;
+    size_t mem_start = 640 * 480 * 2;
+    size_t mem_size = 1024 * 1024 * 4 - mem_start;
 
     TRACE_ENTER("GlamoScreenInit");
 

-- 
xf86-video-glamo, SMedia Glamo video driver for X.Org