Module Name: xsrc
Committed By: mrg
Date: Thu Jul 9 03:46:21 UTC 2009
Modified Files:
xsrc/external/mit/xf86-video-glint/dist/src: glint_driver.c
Log Message:
merge xf86-video-glint-1.2.3
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-glint/dist/src/glint_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-glint/dist/src/glint_driver.c
diff -u xsrc/external/mit/xf86-video-glint/dist/src/glint_driver.c:1.3 xsrc/external/mit/xf86-video-glint/dist/src/glint_driver.c:1.4
--- xsrc/external/mit/xf86-video-glint/dist/src/glint_driver.c:1.3 Wed Jun 10 00:52:03 2009
+++ xsrc/external/mit/xf86-video-glint/dist/src/glint_driver.c Thu Jul 9 03:46:21 2009
@@ -229,159 +229,8 @@
{ -1 }
};
-static const char *xf8_32bppSymbols[] = {
- "cfb8_32ScreenInit",
- "xf86Overlay8Plus32Init",
- NULL
-};
-
-static const char *xaaSymbols[] = {
- "XAACreateInfoRec",
- "XAADestroyInfoRec",
- "XAAInit",
- "XAAPolyLines",
- "XAAPolySegment",
- NULL
-};
-
-static const char *fbSymbols[] = {
- "fbBres",
- "fbPictureInit",
- "fbScreenInit",
- NULL
-};
-
-static const char *ddcSymbols[] = {
- "xf86PrintEDID",
- "xf86DoEDID_DDC2",
- "xf86SetDDCproperties",
- NULL
-};
-
-static const char *i2cSymbols[] = {
- "xf86CreateI2CBusRec",
- "xf86DestroyI2CBusRec",
- "xf86DestroyI2CDevRec",
- "xf86I2CBusInit",
- "xf86I2CDevInit",
- "xf86I2CProbeAddress",
- "xf86I2CWriteByte",
- "xf86I2CWriteVec",
- NULL
-};
-
-static const char *shadowSymbols[] = {
- "ShadowFBInit",
- NULL
-};
-
-#ifdef XFree86LOADER
-static const char *vbeSymbols[] = {
- "VBEInit",
- "vbeDoEDID",
- "vbeFree",
- NULL
-};
-#endif
-
-static const char *ramdacSymbols[] = {
- "IBMramdac526CalculateMNPCForClock",
- "IBMramdac640CalculateMNPCForClock",
- "IBMramdacProbe",
- "RamDacCreateInfoRec",
- "RamDacDestroyInfoRec",
- "RamDacFreeRec",
- "RamDacGetHWIndex",
- "RamDacHandleColormaps",
- "RamDacInit",
- "TIramdacCalculateMNPForClock",
- "TIramdacLoadPalette",
- "TIramdacLoadPaletteWeak",
- "TIramdacProbe",
- "xf86CreateCursorInfoRec",
- "xf86DestroyCursorInfoRec",
- "xf86InitCursor",
- NULL
-};
-
-
-static const char *fbdevHWSymbols[] = {
- "fbdevHWFreeRec",
- "fbdevHWInit",
- "fbdevHWProbe",
- "fbdevHWUseBuildinMode",
-
- "fbdevHWGetDepth",
- "fbdevHWGetVidmem",
-
- /* colormap */
- "fbdevHWLoadPaletteWeak",
-
- /* ScrnInfo hooks */
- "fbdevHWAdjustFrameWeak",
- "fbdevHWEnterVT",
- "fbdevHWLeaveVTWeak",
- "fbdevHWMapMMIO",
- "fbdevHWMapVidmem",
- "fbdevHWModeInit",
- "fbdevHWRestore",
- "fbdevHWSave",
- "fbdevHWSwitchMode",
- "fbdevHWUnmapMMIO",
- "fbdevHWUnmapVidmem",
- "fbdevHWValidModeWeak",
-
- NULL
-};
-
-const char *GLINTint10Symbols[] = {
- "xf86FreeInt10",
- "xf86InitInt10",
- NULL
-};
-
#ifdef XFree86LOADER
-#ifdef XF86DRI_DEVEL
-static const char *drmSymbols[] = {
- "drmAddBufs",
- "drmAddMap",
- "drmAgpAcquire",
- "drmAgpAlloc",
- "drmAgpBind",
- "drmAgpEnable",
- "drmAgpFree",
- "drmAgpGetMode",
- "drmAgpRelease",
- "drmAgpUnbind",
- "drmCommandWrite",
- "drmCtlInstHandler",
- "drmFreeBufs",
- "drmFreeVersion",
- "drmGetInterruptFromBusID",
- "drmGetLibVersion",
- "drmGetVersion",
- "drmMap",
- "drmMapBufs",
- "drmUnmap",
- "drmUnmapBufs",
- NULL
-};
-
-static const char *driSymbols[] = {
- "DRICloseScreen",
- "DRICreateInfoRec",
- "DRIDestroyInfoRec",
- "DRIFinishScreenInit",
- "DRIGetDrawableIndex",
- "DRIQueryVersion",
- "DRIScreenInit",
- "GlxSetVisualConfigs",
- "DRICreatePCIBusID",
- NULL
-};
-#endif
-
static MODULESETUPPROTO(glintSetup);
static XF86ModuleVersionInfo glintVersRec =
@@ -408,14 +257,6 @@
if (!setupDone) {
setupDone = TRUE;
xf86AddDriver(&GLINT, module, 0);
- LoaderRefSymLists(fbSymbols, ddcSymbols, i2cSymbols,
- xaaSymbols, xf8_32bppSymbols,
- shadowSymbols, fbdevHWSymbols, GLINTint10Symbols,
- vbeSymbols, ramdacSymbols,
-#ifdef XF86DRI_DEVEL
- drmSymbols, driSymbols,
-#endif
- NULL);
return (pointer)TRUE;
}
@@ -663,8 +504,6 @@
if (!xf86LoadDrvSubModule(drv, "fbdevhw"))
return FALSE;
- xf86LoaderReqSymLists(fbdevHWSymbols, NULL);
-
for (i = 0; i < numDevSections; i++) {
dev = xf86FindOptionValue(devSections[i]->options,"fbdev");
if (devSections[i]->busID) {
@@ -986,7 +825,6 @@
ClockRangePtr clockRanges;
char *mod = NULL;
const char *s;
- const char **syms = NULL;
TRACE_ENTER("GLINTPreInit");
@@ -1101,7 +939,6 @@
pScrn->monitor = pScrn->confScreen->monitor;
/*
* The first thing we should figure out is the depth, bpp, etc.
- * Our default depth is 8, so pass it to the helper function.
* We support both 24bpp and 32bpp layouts, so indicate that.
*/
if (FBDevProbed) {
@@ -1115,7 +952,7 @@
if (!xf86SetDepthBpp(pScrn, default_depth, default_depth, fbbpp,0))
return FALSE;
} else {
- if (!xf86SetDepthBpp(pScrn, 8, 0, 0, Support24bppFb | Support32bppFb
+ if (!xf86SetDepthBpp(pScrn, 0, 0, 0, Support24bppFb | Support32bppFb
/*| SupportConvert32to24 | PreferConvert32to24*/))
return FALSE;
}
@@ -1239,8 +1076,6 @@
return FALSE;
}
- xf86LoaderReqSymLists(fbdevHWSymbols, NULL);
-
if (!fbdevHWInit(pScrn,NULL,xf86FindOptionValue(pGlint->pEnt->device->options,"fbdev")))
{
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "fbdevHWInit failed!\n");
@@ -1438,6 +1273,7 @@
}
}
+#if !defined(__sparc__)
/* Initialize the card through int10 interface if needed */
if (pGlint->Chipset != PCI_VENDOR_3DLABS_CHIP_GAMMA &&
pGlint->Chipset != PCI_VENDOR_3DLABS_CHIP_GAMMA2 &&
@@ -1446,12 +1282,12 @@
if ( xf86LoadSubModule(pScrn, "int10")){
xf86Int10InfoPtr pInt;
- xf86LoaderReqSymLists(GLINTint10Symbols, NULL);
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Initializing int10\n");
pInt = xf86InitInt10(pGlint->pEnt->index);
xf86FreeInt10(pInt);
}
}
+#endif
pGlint->FbMapSize = 0;
@@ -1677,8 +1513,6 @@
if (!xf86LoadSubModule(pScrn, "ramdac"))
return FALSE;
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
-
/* Let's check what type of DAC we have and reject if necessary */
switch (pGlint->Chipset) {
case PCI_VENDOR_TI_CHIP_PERMEDIA2:
@@ -2054,7 +1888,6 @@
GLINTFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(ddcSymbols, NULL);
/* Load I2C if needed */
if ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_PERMEDIA2) ||
(pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_PERMEDIA2V) ||
@@ -2065,7 +1898,6 @@
if (xf86LoadSubModule(pScrn, "i2c")) {
I2CBusPtr pBus;
- xf86LoaderReqSymLists(i2cSymbols, NULL);
if ((pBus = xf86CreateI2CBusRec())) {
pBus->BusName = "DDC";
pBus->scrnIndex = pScrn->scrnIndex;
@@ -2098,9 +1930,12 @@
{
xf86MonPtr pMon = NULL;
- if (pGlint->DDCBus)
+ if (pGlint->DDCBus) {
+ GLINTMapMem(pScrn);
pMon = xf86DoEDID_DDC2(pScrn->scrnIndex, pGlint->DDCBus);
-
+ GLINTUnmapMem(pScrn);
+ }
+
if (!pMon)
/* Try DDC1 */;
@@ -2395,15 +2230,12 @@
case 16:
case 24:
mod = "fb";
- syms = fbSymbols;
break;
case 32:
if (pScrn->overlayFlags & OVERLAY_8_32_PLANAR) {
mod = "xf8_32bpp";
- syms = xf8_32bppSymbols;
} else {
mod = "fb";
- syms = fbSymbols;
}
break;
}
@@ -2411,9 +2243,6 @@
GLINTFreeRec(pScrn);
return FALSE;
}
- if (mod && syms) {
- xf86LoaderReqSymLists(syms, NULL);
- }
/* Load XAA if needed */
if (!pGlint->NoAccel) {
@@ -2421,7 +2250,6 @@
GLINTFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(xaaSymbols, NULL);
}
/* Load shadowfb if needed */
@@ -2430,7 +2258,6 @@
GLINTFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(shadowSymbols, NULL);
}
TRACE_EXIT("GLINTPreInit");
