xf86-video-intel: src/common.h src/i810_driver.c src/i810.h src/i830_driver.c src/i830_dvo.c src/i830.h
Adam Jackson
ajax at kemper.freedesktop.org
Thu May 28 12:03:48 PDT 2009
src/common.h | 11 ---
src/i810.h | 2
src/i810_driver.c | 166 ------------------------------------------------------
src/i830.h | 1
src/i830_driver.c | 7 --
src/i830_dvo.c | 29 ---------
6 files changed, 1 insertion(+), 215 deletions(-)
New commits:
commit 704771f1c595df481d244a6f074e9f5620d4a720
Author: Adam Jackson <ajax at redhat.com>
Date: Thu May 28 15:03:45 2009 -0400
Remove useless loader symbol lists.
diff --git a/src/common.h b/src/common.h
index ab7a653..335fe75 100644
--- a/src/common.h
+++ b/src/common.h
@@ -82,17 +82,6 @@ extern void I830InitpScrn(ScrnInfoPtr pScrn);
/* Symbol lists shared by the i810 and i830 parts. */
extern int I830EntityIndex;
-extern const char *I810vgahwSymbols[];
-extern const char *I810ramdacSymbols[];
-extern const char *I810ddcSymbols[];
-extern const char *I810fbSymbols[];
-extern const char *I810xaaSymbols[];
-extern const char *I810shadowFBSymbols[];
-#ifdef XF86DRI
-extern const char *I810driSymbols[];
-extern const char *I810drmSymbols[];
-#endif
-extern const char *I810i2cSymbols[];
extern void I830DPRINTF_stub(const char *filename, int line,
const char *function, const char *fmt, ...);
diff --git a/src/i810.h b/src/i810.h
index bb356e8..93b8b76 100644
--- a/src/i810.h
+++ b/src/i810.h
@@ -266,8 +266,6 @@ typedef struct _I810Rec {
int drmMinor;
} I810Rec;
-extern const char *I810vbeSymbols[];
-
#define I810PTR(p) ((I810Ptr)((p)->driverPrivate))
#define I810_SELECT_FRONT 0
diff --git a/src/i810_driver.c b/src/i810_driver.c
index 627cffc..21c35da 100644
--- a/src/i810_driver.c
+++ b/src/i810_driver.c
@@ -258,145 +258,6 @@ static const OptionInfoRec I810Options[] = {
/* *INDENT-ON* */
#endif
-const char *I810vgahwSymbols[] = {
- "vgaHWFreeHWRec",
- "vgaHWGetHWRec",
- "vgaHWGetIOBase",
- "vgaHWGetIndex",
- "vgaHWInit",
- "vgaHWLock",
- "vgaHWMapMem",
- "vgaHWProtect",
- "vgaHWRestore",
- "vgaHWSave",
- "vgaHWSaveScreen",
- "vgaHWSetMmioFuncs",
- "vgaHWUnlock",
- "vgaHWUnmapMem",
- NULL
-};
-
-const char *I810fbSymbols[] = {
- "fbPictureInit",
- "fbScreenInit",
- NULL
-};
-
-const char *I810vbeSymbols[] = {
- "VBEFreeModeInfo",
- "VBEFreeVBEInfo",
- "VBEGetModeInfo",
- "VBEGetModePool",
- "VBEGetVBEInfo",
- "VBEGetVBEMode",
- "VBEInit",
- "VBEPrintModes",
- "VBESaveRestore",
- "VBESetDisplayStart",
- "VBESetGetDACPaletteFormat",
- "VBESetGetLogicalScanlineLength",
- "VBESetGetPaletteData",
- "VBESetModeNames",
- "VBESetModeParameters",
- "VBESetVBEMode",
- "VBEValidateModes",
- "vbeDoEDID",
- "vbeFree",
- NULL
-};
-
-#ifdef XFree86LOADER
-static const char *vbeOptionalSymbols[] = {
- "VBEDPMSSet",
- "VBEGetPixelClock",
- NULL
-};
-#endif
-
-const char *I810ddcSymbols[] = {
- "xf86PrintEDID",
- "xf86SetDDCproperties",
- NULL
-};
-
-const char *I810xaaSymbols[] = {
- "XAACreateInfoRec",
- "XAADestroyInfoRec",
- "XAAInit",
- "XAAGetCopyROP",
- "XAAGetPatternROP",
- NULL
-};
-
-const char *I810ramdacSymbols[] = {
- "xf86CreateCursorInfoRec",
- "xf86DestroyCursorInfoRec",
- "xf86InitCursor",
- NULL
-};
-
-const char *I810shadowFBSymbols[] = {
- "ShadowFBInit",
- NULL
-};
-
-#ifdef XF86DRI
-const char *I810drmSymbols[] = {
- "drmAddBufs",
- "drmAddMap",
- "drmAgpAcquire",
- "drmAgpAlloc",
- "drmAgpBind",
- "drmAgpEnable",
- "drmAgpFree",
- "drmAgpRelease",
- "drmAgpUnbind",
- "drmAuthMagic",
- "drmCommandNone",
- "drmCommandWrite",
- "drmCreateContext",
- "drmCtlInstHandler",
- "drmCtlUninstHandler",
- "drmDestroyContext",
- "drmFreeVersion",
- "drmGetInterruptFromBusID",
- "drmGetLibVersion",
- "drmGetVersion",
- "drmRmMap",
-#ifdef XSERVER_LIBDRM_MM
- "drmMMInit",
- "drmMMTakedown",
- "drmMMLock",
- "drmMMUnlock",
-#endif
- NULL
-};
-
-
-const char *I810driSymbols[] = {
- "DRICloseScreen",
- "DRICreateInfoRec",
- "DRIGetContext",
- "DRIDestroyInfoRec",
- "DRIFinishScreenInit",
- "DRIGetSAREAPrivate",
- "DRILock",
- "DRIQueryVersion",
- "DRIScreenInit",
- "DRIUnlock",
- "GlxSetVisualConfigs",
- "DRICreatePCIBusID",
- NULL
-};
-
-#endif /* I830_ONLY */
-
-const char *I810i2cSymbols[] = {
- "xf86CreateI2CBusRec",
- "xf86I2CBusInit",
- NULL
-};
-
#ifndef I810_DEBUG
int I810_DEBUG = (0
/* | DEBUG_ALWAYS_SYNC */
@@ -457,20 +318,6 @@ i810Setup(pointer module, pointer opts, int *errmaj, int *errmin)
);
/*
- * Tell the loader about symbols from other modules that this module
- * might refer to.
- */
- LoaderRefSymLists(I810vgahwSymbols,
- I810fbSymbols, I810xaaSymbols, I810ramdacSymbols,
-#ifdef XF86DRI
- I810drmSymbols,
- I810driSymbols,
-#endif
- I810shadowFBSymbols,
- I810vbeSymbols, vbeOptionalSymbols,
- I810ddcSymbols, NULL);
-
- /*
* The return value must be non-NULL on success even though there
* is no TearDownProc.
*/
@@ -634,7 +481,6 @@ I810DoDDC(ScrnInfoPtr pScrn, int index)
}
if (xf86LoadSubModule(pScrn, "vbe") && (pVbe = VBEInit(NULL, index))) {
- xf86LoaderReqSymLists(I810vbeSymbols, NULL);
MonInfo = vbeDoEDID(pVbe, NULL);
xf86PrintEDID(MonInfo);
xf86SetDDCproperties(pScrn, MonInfo);
@@ -689,8 +535,6 @@ I810PreInit(ScrnInfoPtr pScrn, int flags)
if (!xf86LoadSubModule(pScrn, "vgahw"))
return FALSE;
- xf86LoaderReqSymLists(I810vgahwSymbols, NULL);
-
/* Allocate a vgaHWRec */
if (!vgaHWGetHWRec(pScrn))
return FALSE;
@@ -781,7 +625,6 @@ I810PreInit(ScrnInfoPtr pScrn, int flags)
I810FreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(I810xaaSymbols, NULL);
}
#ifdef XF86DRI
@@ -1019,14 +862,12 @@ I810PreInit(ScrnInfoPtr pScrn, int flags)
I810FreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(I810fbSymbols, NULL);
if (!xf86ReturnOptValBool(pI810->Options, OPTION_SW_CURSOR, FALSE)) {
if (!xf86LoadSubModule(pScrn, "ramdac")) {
I810FreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(I810ramdacSymbols, NULL);
}
if (xf86GetOptValInteger
@@ -1053,9 +894,6 @@ I810PreInit(ScrnInfoPtr pScrn, int flags)
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"Couldn't load shadowfb module:\n");
}
- else {
- xf86LoaderReqSymLists(I810shadowFBSymbols, NULL);
- }
}
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "page flipping %s\n",
@@ -1087,9 +925,7 @@ I810PreInit(ScrnInfoPtr pScrn, int flags)
#ifdef XF86DRI
/* Load the dri module if requested. */
if (xf86ReturnOptValBool(pI810->Options, OPTION_DRI, FALSE)) {
- if (xf86LoadSubModule(pScrn, "dri")) {
- xf86LoaderReqSymLists(I810driSymbols, I810drmSymbols, NULL);
- }
+ xf86LoadSubModule(pScrn, "dri");
}
#endif
diff --git a/src/i830.h b/src/i830.h
index 7c260de..60dc146 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -210,7 +210,6 @@ struct _I830DVODriver {
unsigned int dvo_reg;
uint32_t gpio;
int address;
- const char **symbols;
I830I2CVidOutputRec *vid_rec;
void *dev_priv;
pointer modhandle;
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 0b6bb71..8375e94 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -824,7 +824,6 @@ I830PreInitDDC(ScrnInfoPtr pScrn)
if (!xf86LoadSubModule(pScrn, "ddc")) {
pI830->ddc2 = FALSE;
} else {
- xf86LoaderReqSymLists(I810ddcSymbols, NULL);
pI830->ddc2 = TRUE;
}
@@ -832,8 +831,6 @@ I830PreInitDDC(ScrnInfoPtr pScrn)
/* Load I2C if we have the code to use it */
if (pI830->ddc2) {
if (xf86LoadSubModule(pScrn, "i2c")) {
- xf86LoaderReqSymLists(I810i2cSymbols, NULL);
-
pI830->ddc2 = TRUE;
} else {
pI830->ddc2 = FALSE;
@@ -1266,11 +1263,9 @@ I830LoadSyms(ScrnInfoPtr pScrn)
/* The vgahw module should be loaded here when needed */
if (!xf86LoadSubModule(pScrn, "vgahw"))
return FALSE;
- xf86LoaderReqSymLists(I810vgahwSymbols, NULL);
if (!xf86LoadSubModule(pScrn, "ramdac"))
return FALSE;
- xf86LoaderReqSymLists(I810ramdacSymbols, NULL);
return TRUE;
}
@@ -1675,8 +1670,6 @@ I830PreInit(ScrnInfoPtr pScrn, int flags)
return FALSE;
}
- xf86LoaderReqSymLists(I810fbSymbols, NULL);
-
if (!pI830->use_drm_mode) {
i830CompareRegsToSnapshot(pScrn, "After PreInit");
diff --git a/src/i830_dvo.c b/src/i830_dvo.c
index a0e8074..2f74144 100644
--- a/src/i830_dvo.c
+++ b/src/i830_dvo.c
@@ -38,28 +38,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "ch7xxx/ch7xxx.h"
#include "tfp410/tfp410.h"
-static const char *SIL164Symbols[] = {
- "Sil164VidOutput",
- NULL
-};
-static const char *TFP410Symbols[] = {
- "Tfp410VidOutput",
- NULL
-};
-static const char *CH7xxxSymbols[] = {
- "CH7xxxVidOutput",
- NULL
-};
-static const char *ivch_symbols[] = {
- "ivch_methods",
- NULL
-};
-
-static const char *ch7017_symbols[] = {
- "ch7017_methods",
- NULL
-};
-
/* driver list */
static struct _I830DVODriver i830_dvo_drivers[] =
{
@@ -69,7 +47,6 @@ static struct _I830DVODriver i830_dvo_drivers[] =
.fntablename = "SIL164VidOutput",
.dvo_reg = DVOC,
.address = (SIL164_ADDR_1<<1),
- .symbols = SIL164Symbols
},
{
.type = I830_OUTPUT_DVO_TMDS,
@@ -77,7 +54,6 @@ static struct _I830DVODriver i830_dvo_drivers[] =
.fntablename = "CH7xxxVidOutput",
.dvo_reg = DVOC,
.address = (CH7xxx_ADDR_1<<1),
- .symbols = CH7xxxSymbols
},
{
.type = I830_OUTPUT_DVO_LVDS,
@@ -85,7 +61,6 @@ static struct _I830DVODriver i830_dvo_drivers[] =
.fntablename = "ivch_methods",
.dvo_reg = DVOA,
.address = 0x04, /* Might also be 0x44, 0x84, 0xc4 */
- .symbols = ivch_symbols
},
{
.type = I830_OUTPUT_DVO_TMDS,
@@ -93,7 +68,6 @@ static struct _I830DVODriver i830_dvo_drivers[] =
.fntablename = "TFP410VidOutput",
.dvo_reg = DVOC,
.address = (TFP410_ADDR_1<<1),
- .symbols = TFP410Symbols
},
{
.type = I830_OUTPUT_DVO_LVDS,
@@ -101,7 +75,6 @@ static struct _I830DVODriver i830_dvo_drivers[] =
.fntablename = "ch7017_methods",
.dvo_reg = DVOC,
.address = 0xea,
- .symbols = ch7017_symbols,
.gpio = GPIOE,
}
};
@@ -447,8 +420,6 @@ i830_dvo_init(ScrnInfoPtr pScrn)
if (drv->modhandle == NULL)
continue;
- xf86LoaderReqSymLists(drv->symbols, NULL);
-
ret_ptr = NULL;
drv->vid_rec = LoaderSymbol(drv->fntablename);
More information about the xorg-commit
mailing list