File xf86-video-xgixp-symbols.diff of Package xorg-x11-driver-video.import4408

Overview Repositories Revisions Requests Users Attributes Meta

File xf86-video-xgixp-symbols.diff of Package xorg-x11-driver-video.import4408

diff -u -r -p ../xf86-video-xgixp-1.8.0.orig//src/xgi_driver.c ./src/xgi_driver.c
--- ../xf86-video-xgixp-1.8.0.orig//src/xgi_driver.c	2011-01-28 11:22:23.000000000 +0000
+++ ./src/xgi_driver.c	2011-01-28 11:24:48.000000000 +0000
@@ -151,149 +151,6 @@ static void xg47_setup_fb_wrap(ReadMemor
     WriteMemoryProcPtr *write_ptr, DrawablePtr pDraw);
 static void xg47_finish_fb_wrap(DrawablePtr pDraw);
 
-
-static const char *vgahwSymbols[] = {
-    "vgaHWBlankScreen",
-    "vgaHWddc1SetSpeedWeak",
-    "vgaHWFreeHWRec",
-    "vgaHWGetHWRec",
-    "vgaHWGetIOBase",
-    "vgaHWGetIndex",
-    "vgaHWInit",
-    "vgaHWLock",
-    "vgaHWMapMem",
-    "vgaHWProtect",
-    "vgaHWRestore",
-    "vgaHWSave",
-    "vgaHWSaveScreen",
-    "vgaHWSetMmioFuncs",
-    "vgaHWUnlock",
-    NULL
-};
-
-static const char *ddcSymbols[] = {
-    "xf86DoEDID_DDC1",
-    "xf86DoEDID_DDC2",
-    "xf86PrintEDID",
-    "xf86SetDDCproperties",
-    NULL
-};
-
-static const char *i2cSymbols[] = {
-    "xf86CreateI2CBusRec",
-    "xf86I2CBusInit",
-    NULL
-};
-
-static const char *fbSymbols[] = {
-#if X_BYTE_ORDER == X_BIG_ENDIAN
-    "wfbPictureInit",
-    "wfbScreenInit",
-#else
-    "fbPictureInit",
-    "fbScreenInit",
-#endif
-    NULL
-};
-
-static const char *xaaSymbols[] = {
-    "XAACreateInfoRec",
-    "XAADestroyInfoRec",
-    "XAAFillSolidRects",
-    "XAAGetCopyROP",
-    "XAAGetPatternROP", 
-    "XAAInit",
-    "XAAScreenIndex",
-    "XAAStippleScanlineFuncLSBFirst",
-    "XAAOverlayFBfuncs",
-    "XAACachePlanarMonoStipple",
-    "XAAHelpPatternROP",
-    NULL
-};
-
-static const char *ramdacSymbols[] = {
-    "xf86CreateCursorInfoRec",
-    "xf86DestroyCursorInfoRec",
-    "xf86InitCursor",
-    NULL
-};
-
-static const char *drmSymbols[] = {
-    "drmGetInterruptFromBusID",
-    "drmCtlInstHandler",
-    "drmCtlUninstHandler",
-    "drmCommandNone",
-    "drmCommandRead",
-    "drmCommandWrite",
-    "drmCommandWriteRead",
-    "drmFreeVersion",
-    "drmGetLibVersion",
-    "drmGetVersion",
-    "drmMap",
-    "drmUnmap",
-    NULL
-};
-
-static const char *driSymbols[] = {
-    "DRICloseScreen",
-    "DRICreateInfoRec",
-    "DRIDestroyInfoRec",
-    "DRIFinishScreenInit",
-    "DRIGetContext",
-    "DRIGetDeviceInfo",
-    "DRIGetSAREAPrivate",
-    "DRILock",
-    "DRIQueryVersion",
-    "DRIScreenInit",
-    "DRIUnlock",
-    "DRICreatePCIBusID",
-    NULL
-};
-
-static const char *vbeSymbols[] = {
-    "VBEInit",
-    "VBEDPMSSet",
-    "vbeDoEDID",
-    "vbeFree",
-    NULL
-};
-
-static const char *int10Symbols[] = {
-    "xf86ExecX86int10",
-    "xf86FreeInt10",
-    "xf86InitInt10",
-    NULL
-};
-
-static const char *shadowSymbols[] = {
-    "shadowInit",
-    NULL
-};
-
-static const char *fbdevHWSymbols[] = {
-    "fbdevHWInit",
-    "fbdevHWUseBuildinMode",
-    "fbdevHWGetLineLength",
-    "fbdevHWGetVidmem",
-    "fbdevHWDPMSSet",
-    /* colormap */
-    "fbdevHWLoadPaletteWeak",
-    /* ScrnInfo hooks */
-    "fbdevHWAdjustFrameWeak",
-    "fbdevHWEnterVT",
-    "fbdevHWLeaveVT",
-    "fbdevHWModeInit",
-    "fbdevHWRestore",
-    "fbdevHWSave",
-    "fbdevHWSwitchModeWeak",
-    "fbdevHWValidModeWeak",
-    "fbdevHWMapMMIO",
-    "fbdevHWMapVidmem",
-    "fbdevHWUnmapMMIO",
-    "fbdevHWUnmapVidmem",
-    NULL
-};
-
 #ifdef XSERVER_LIBPCIACCESS
 #define XGI_DEVICE_MATCH(d, i) \
     { 0x18ca, (d), PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, (i) }
@@ -430,13 +287,6 @@ static pointer XGISetup(pointer module,
             return NULL;
         }
 
-        LoaderReqSymLists(vgahwSymbols, fbSymbols, driSymbols, drmSymbols,
-                          NULL);
-
-
-        LoaderRefSymLists(i2cSymbols, ramdacSymbols, 
-                          xaaSymbols, shadowSymbols, fbdevHWSymbols, NULL);
-
         /*
          * The return value must be non-NULL on success even though
          * there is no TearDownProc.
@@ -1017,8 +867,6 @@ static Bool XGIPreInitInt10(ScrnInfoPtr
         return FALSE;
     }
 
-    xf86LoaderReqSymLists(vbeSymbols, int10Symbols, NULL);
-
 #if DBG_FLOW
     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "-- Leave %s() %s:%d\n", __FUNCTION__, __FILE__, __LINE__);
 #endif
@@ -1287,7 +1135,6 @@ static Bool XGIPreInitCursor(ScrnInfoPtr
     if (!xf86ReturnOptValBool(pXGI->pOptionInfo, OPTION_SW_CURSOR, FALSE))
     {
         if (!xf86LoadSubModule(pScrn, "ramdac")) return FALSE;
-        xf86LoaderReqSymLists(ramdacSymbols, NULL);
     }
 
 #if DBG_FLOW
@@ -1314,8 +1161,6 @@ static Bool XGIPreInitAccel(ScrnInfoPtr
          */
         if (!g_DualViewMode || pXGI->FirstView) 
             if (!xf86LoadSubModule(pScrn, "xaa")) return FALSE;
-
-        xf86LoaderReqSymLists(xaaSymbols, NULL);
     }
 
 #if DBG_FLOW
@@ -1476,7 +1321,6 @@ static Bool XGIPreInitShadow(ScrnInfoPtr
             XGIFreeRec(pScrn);
             return FALSE;
         }
-        xf86LoaderReqSymLists(shadowSymbols, NULL);
     }
 
 #if DBG_FLOW
@@ -1493,7 +1337,6 @@ xf86MonPtr get_configured_monitor(ScrnIn
 
 
     if (xf86LoadSubModule(pScrn, "i2c")) {
-        xf86LoaderReqSymLists(i2cSymbols, NULL);
 	if (!xg47_InitI2C(pScrn)) {
 	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 		       "I2C initialization failed!\n");
@@ -1508,9 +1351,6 @@ xf86MonPtr get_configured_monitor(ScrnIn
         return NULL;
     }
 
-    xf86LoaderReqSymLists(ddcSymbols, NULL);
-
-
     if (pXGI->pI2C != NULL) {
         pMon = xf86DoEDID_DDC2(pScrn->scrnIndex, pXGI->pI2C);
     }
@@ -1650,7 +1490,6 @@ Bool XGIPreInit(ScrnInfoPtr pScrn, int f
 
 	/* Jong 07/07/2006; has error - _dl_catch_error() from /lib/ld-linux.so.2 ???? */
         if (!xf86LoadSubModule(pScrn, "fbdevhw")) return FALSE;
-        xf86LoaderReqSymLists(fbdevHWSymbols, NULL);
 
         /* check for linux framebuffer device */
         if (!fbdevHWInit(pScrn, pXGI->pPciInfo, NULL)) return FALSE;

Places

File xf86-video-xgixp-symbols.diff of Package xorg-x11-driver-video.import4408

Places