[pkg-fso-commits] [SCM] xf86-video-glamo, SMedia Glamo video driver for X.Org branch, master, updated. upstream/0.0.0+20090707.git98c012f7-57-g9918e08

[Thomas White]

The following commit has been merged in the master branch:
commit 270241cebfac55088868c686c3ffa3b0b4f94fe1
Author: Thomas White <taw at bitwiz.org.uk>
Date:   Fri Aug 21 00:56:16 2009 +0100

    Strip out some RAC and loader stuff
    
    This is necessary to keep up with the latest Xorg-server developments.
    It works with the latest Git master of the server, which we want to use for the
    great speedups arising from mixed mode EXA pixmap handling.
    
    Please let me know if it breaks on older versions...

diff --git a/src/glamo-driver.c b/src/glamo-driver.c
index 002dca3..53b72e0 100644
--- a/src/glamo-driver.c
+++ b/src/glamo-driver.c
@@ -23,7 +23,6 @@
 /* for visuals */
 #include "fb.h"
 
-#include "xf86Resources.h"
 #include "xf86RAC.h"
 
 #include "fbdevhw.h"
@@ -425,10 +424,6 @@ GlamoPreInit(ScrnInfoPtr pScrn, int flags)
 
     pGlamo->pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
 
-    pScrn->racMemFlags = RAC_FB | RAC_CURSOR | RAC_VIEWPORT;
-    /* XXX Is this right?  Can probably remove RAC_FB */
-    pScrn->racIoFlags = RAC_FB | RAC_CURSOR | RAC_VIEWPORT;
-
     fb_device = xf86FindOptionValue(pGlamo->pEnt->device->options, "Device");
 
     /* open device */
diff --git a/src/glamo-kms-driver.c b/src/glamo-kms-driver.c
index 55d2377..afc7d6b 100644
--- a/src/glamo-kms-driver.c
+++ b/src/glamo-kms-driver.c
@@ -75,13 +75,6 @@
 #include "glamo-kms-output.h"
 
 
-static const char *fbSymbols[] = {
-    "fbPictureInit",
-    "fbScreenInit",
-    NULL
-};
-
-
 /* Return TRUE if KMS can be used */
 Bool GlamoKernelModesettingAvailable()
 {
@@ -208,7 +201,6 @@ Bool GlamoKMSPreInit(ScrnInfoPtr pScrn, int flags)
 	pGlamo->drm_fd = drmOpen(NULL, "platform:glamo-fb");
 	if ( pGlamo->drm_fd < 0 ) return FALSE;
 
-	pScrn->racMemFlags = RAC_FB | RAC_COLORMAP;
 	pScrn->monitor = pScrn->confScreen->monitor;
 	pScrn->progClock = TRUE;
 	pScrn->rgbBits = 8;
@@ -262,7 +254,6 @@ Bool GlamoKMSPreInit(ScrnInfoPtr pScrn, int flags)
 
 	/* Load the required sub modules */
 	if (!xf86LoadSubModule(pScrn, "fb")) return FALSE;
-	xf86LoaderReqSymLists(fbSymbols, NULL);
 	xf86LoadSubModule(pScrn, "exa");
 	xf86LoadSubModule(pScrn, "dri2");
 

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