summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/r128_driver.c201
-rw-r--r--src/r128_misc.c6
-rw-r--r--src/r128_probe.h1
-rw-r--r--src/radeon.h2
-rw-r--r--src/radeon_accelfuncs.c10
-rw-r--r--src/radeon_driver.c214
-rw-r--r--src/radeon_misc.c6
-rw-r--r--src/radeon_mm_i2c.c14
-rw-r--r--src/radeon_probe.h1
-rw-r--r--src/radeon_video.c3
-rw-r--r--src/theatre.h38
-rw-r--r--src/theatre_detect.h11
12 files changed, 3 insertions, 504 deletions
diff --git a/src/r128_driver.c b/src/r128_driver.c
index 9c41b7bc..4fcaab31 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -194,186 +194,6 @@ R128RAMRec R128RAM[] = { /* Memory Specifications
{ 4, 4, 3, 3, 2, 3, 1, 16, 12, "64-bit DDR SGRAM" },
};
-#ifdef WITH_VGAHW
-static const char *vgahwSymbols[] = {
- "vgaHWFreeHWRec",
- "vgaHWGetHWRec",
- "vgaHWGetIndex",
- "vgaHWLock",
- "vgaHWRestore",
- "vgaHWSave",
- "vgaHWUnlock",
- NULL
-};
-#endif
-
-static const char *fbdevHWSymbols[] = {
- "fbdevHWInit",
- "fbdevHWUseBuildinMode",
- "fbdevHWGetLineLength",
- "fbdevHWGetVidmem",
-
- "fbdevHWDPMSSet",
- "fbdevHWDPMSSetWeak",
-
- /* colormap */
- "fbdevHWLoadPalette",
- "fbdevHWLoadPaletteWeak",
-
- /* ScrnInfo hooks */
- "fbdevHWAdjustFrame",
- "fbdevHWAdjustFrameWeak",
- "fbdevHWEnterVT",
- "fbdevHWLeaveVT",
- "fbdevHWModeInit",
- "fbdevHWRestore",
- "fbdevHWSave",
- "fbdevHWSwitchMode",
- "fbdevHWSwitchModeWeak",
- "fbdevHWValidModeWeak",
-
- "fbdevHWMapMMIO",
- "fbdevHWMapVidmem",
- "fbdevHWUnmapMMIO",
- "fbdevHWUnmapVidmem",
-
- NULL
-};
-
-static const char *ddcSymbols[] = {
- "xf86PrintEDID",
- "xf86DoEDID_DDC1",
- "xf86DoEDID_DDC2",
- NULL
-};
-
-static const char *i2cSymbols[] = {
- "xf86CreateI2CBusRec",
- "xf86I2CBusInit",
- NULL
-};
-
-static const char *fbSymbols[] = {
- "fbPictureInit",
- "fbScreenInit",
- NULL
-};
-
-static const char *xaaSymbols[] = {
- "XAACreateInfoRec",
- "XAADestroyInfoRec",
- "XAAInit",
- NULL
-};
-
-static const char *ramdacSymbols[] = {
- "xf86CreateCursorInfoRec",
- "xf86DestroyCursorInfoRec",
- "xf86InitCursor",
- NULL
-};
-
-#ifdef XF86DRI
-static const char *drmSymbols[] = {
- "drmAddBufs",
- "drmAddMap",
- "drmAgpAcquire",
- "drmAgpAlloc",
- "drmAgpBase",
- "drmAgpBind",
- "drmAgpDeviceId",
- "drmAgpEnable",
- "drmAgpFree",
- "drmAgpGetMode",
- "drmAgpRelease",
- "drmAgpUnbind",
- "drmAgpVendorId",
- "drmAvailable",
- "drmCommandNone",
- "drmCommandRead",
- "drmCommandWrite",
- "drmCommandWriteRead",
- "drmCtlInstHandler",
- "drmCtlUninstHandler",
- "drmFreeBufs",
- "drmFreeVersion",
- "drmGetInterruptFromBusID",
- "drmGetLibVersion",
- "drmGetVersion",
- "drmMap",
- "drmMapBufs",
- "drmDMA",
- "drmScatterGatherAlloc",
- "drmScatterGatherFree",
- "drmUnmap",
- "drmUnmapBufs",
- NULL
-};
-
-static const char *driSymbols[] = {
- "DRICloseScreen",
- "DRICreateInfoRec",
- "DRIDestroyInfoRec",
- "DRIFinishScreenInit",
- "DRIGetDeviceInfo",
- "DRIGetSAREAPrivate",
- "DRILock",
- "DRIQueryVersion",
- "DRIScreenInit",
- "DRIUnlock",
- "GlxSetVisualConfigs",
- "DRICreatePCIBusID",
- NULL
-};
-
-static const char *driShadowFBSymbols[] = {
- "ShadowFBInit",
- NULL
-};
-#endif
-
-static const char *vbeSymbols[] = {
- "VBEInit",
- "vbeDoEDID",
- "vbeFree",
- NULL
-};
-
-static const char *int10Symbols[] = {
- "xf86InitInt10",
- "xf86FreeInt10",
- "xf86int10Addr",
- NULL
-};
-
-void R128LoaderRefSymLists(void)
-{
- /*
- * Tell the loader about symbols from other modules that this module might
- * refer to.
- */
- xf86LoaderRefSymLists(
-#ifdef WITH_VGAHW
- vgahwSymbols,
-#endif
- fbSymbols,
- xaaSymbols,
- ramdacSymbols,
-#ifdef XF86DRI
- drmSymbols,
- driSymbols,
- driShadowFBSymbols,
-#endif
- fbdevHWSymbols,
- int10Symbols,
- vbeSymbols,
- /* ddcsymbols, */
- i2cSymbols,
- /* shadowSymbols, */
- NULL);
-}
-
-#ifdef XFree86LOADER
int getR128EntityIndex(void)
{
int *r128_entity_index = LoaderSymbol("gR128EntityIndex");
@@ -382,13 +202,6 @@ int getR128EntityIndex(void)
else
return *r128_entity_index;
}
-#else
-extern int gR128EntityIndex;
-int getR128EntityIndex(void)
-{
- return gR128EntityIndex;
-}
-#endif
R128EntPtr R128EntPriv(ScrnInfoPtr pScrn)
{
@@ -1382,14 +1195,12 @@ static Bool R128PreInitDDC(ScrnInfoPtr pScrn, xf86Int10InfoPtr pInt10)
#endif
if (!xf86LoadSubModule(pScrn, "ddc")) return FALSE;
- xf86LoaderReqSymLists(ddcSymbols, NULL);
#if defined(__powerpc__) || defined(__alpha__) || defined(__sparc__)
/* Int10 is broken on PPC and some Alphas */
return TRUE;
#else
if (xf86LoadSubModule(pScrn, "vbe")) {
- xf86LoaderReqSymLists(vbeSymbols,NULL);
pVbe = VBEInit(pInt10,info->pEnt->index);
if (!pVbe) return FALSE;
xf86SetDDCproperties(pScrn,xf86PrintEDID(vbeDoEDID(pVbe,NULL)));
@@ -1444,9 +1255,7 @@ static Bool
R128I2cInit(ScrnInfoPtr pScrn)
{
R128InfoPtr info = R128PTR(pScrn);
- if ( xf86LoadSubModule(pScrn, "i2c") )
- xf86LoaderReqSymLists(i2cSymbols,NULL);
- else{
+ if ( !xf86LoadSubModule(pScrn, "i2c") ) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"Failed to load i2c module\n");
return FALSE;
@@ -1866,7 +1675,6 @@ static Bool R128PreInitModes(ScrnInfoPtr pScrn)
/* Get ScreenInit function */
if (!xf86LoadSubModule(pScrn, "fb")) return FALSE;
- xf86LoaderReqSymLists(fbSymbols, NULL);
info->CurrentLayout.displayWidth = pScrn->displayWidth;
info->CurrentLayout.mode = pScrn->currentMode;
@@ -1881,7 +1689,6 @@ static Bool R128PreInitCursor(ScrnInfoPtr pScrn)
if (!xf86ReturnOptValBool(info->Options, OPTION_SW_CURSOR, FALSE)) {
if (!xf86LoadSubModule(pScrn, "ramdac")) return FALSE;
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
return TRUE;
}
@@ -1893,7 +1700,6 @@ static Bool R128PreInitAccel(ScrnInfoPtr pScrn)
if (!xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE)) {
if (!xf86LoadSubModule(pScrn, "xaa")) return FALSE;
- xf86LoaderReqSymLists(xaaSymbols, NULL);
}
return TRUE;
}
@@ -1904,7 +1710,6 @@ static Bool R128PreInitInt10(ScrnInfoPtr pScrn, xf86Int10InfoPtr *ppInt10)
#if 1 && !defined(__alpha__)
/* int10 is broken on some Alphas */
if (xf86LoadSubModule(pScrn, "int10")) {
- xf86LoaderReqSymLists(int10Symbols, NULL);
xf86DrvMsg(pScrn->scrnIndex,X_INFO,"initializing int10\n");
*ppInt10 = xf86InitInt10(info->pEnt->index);
}
@@ -2018,8 +1823,6 @@ static Bool R128PreInitDRI(ScrnInfoPtr pScrn)
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"Couldn't load shadowfb module:\n");
} else {
- xf86LoaderReqSymLists(driShadowFBSymbols, NULL);
-
info->allowPageFlip = xf86ReturnOptValBool(info->Options,
OPTION_PAGE_FLIP,
FALSE);
@@ -2139,7 +1942,6 @@ Bool R128PreInit(ScrnInfoPtr pScrn, int flags)
if (!xf86LoadSubModule(pScrn, "vgahw"))
info->VGAAccess = FALSE;
else {
- xf86LoaderReqSymLists(vgahwSymbols, NULL);
if (!vgaHWGetHWRec(pScrn))
info->VGAAccess = FALSE;
}
@@ -2186,7 +1988,6 @@ Bool R128PreInit(ScrnInfoPtr pScrn, int flags)
if (info->FBDev) {
/* check for linux framebuffer device */
if (!xf86LoadSubModule(pScrn, "fbdevhw")) return FALSE;
- xf86LoaderReqSymLists(fbdevHWSymbols, NULL);
if (!fbdevHWInit(pScrn, info->PciInfo, NULL)) return FALSE;
pScrn->SwitchMode = fbdevHWSwitchModeWeak();
pScrn->AdjustFrame = fbdevHWAdjustFrameWeak();
diff --git a/src/r128_misc.c b/src/r128_misc.c
index 5ace7d7c..49d2803b 100644
--- a/src/r128_misc.c
+++ b/src/r128_misc.c
@@ -24,8 +24,6 @@
#include "config.h"
#endif
-#ifdef XFree86LOADER
-
#include "ativersion.h"
#include "r128_probe.h"
@@ -71,8 +69,6 @@ R128Setup
if (!xf86ServerIsOnlyDetecting() && !LoaderSymbol(ATI_NAME))
xf86LoadOneModule(ATI_DRIVER_NAME, Options);
- R128LoaderRefSymLists();
-
Inited = TRUE;
}
@@ -86,5 +82,3 @@ _X_EXPORT XF86ModuleData r128ModuleData =
R128Setup,
NULL
};
-
-#endif /* XFree86LOADER */
diff --git a/src/r128_probe.h b/src/r128_probe.h
index 180e52a9..82d0fbea 100644
--- a/src/r128_probe.h
+++ b/src/r128_probe.h
@@ -61,7 +61,6 @@ extern Bool R128Probe(DriverPtr, int);
extern PciChipsets R128PciChipsets[];
/* r128_driver.c */
-extern void R128LoaderRefSymLists(void);
extern Bool R128PreInit(ScrnInfoPtr, int);
extern Bool R128ScreenInit(int, ScreenPtr, int, char **);
extern Bool R128SwitchMode(int, DisplayModePtr, int);
diff --git a/src/radeon.h b/src/radeon.h
index bddbc7b9..2a3838c8 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -670,14 +670,12 @@ typedef struct {
OptionInfoPtr Options;
Bool useEXA;
-#ifdef XFree86LOADER
#ifdef USE_EXA
XF86ModReqInfo exaReq;
#endif
#ifdef USE_XAA
XF86ModReqInfo xaaReq;
#endif
-#endif
/* X itself has the 3D context */
Bool XInited3D;
diff --git a/src/radeon_accelfuncs.c b/src/radeon_accelfuncs.c
index 6fbbc138..e3b37c16 100644
--- a/src/radeon_accelfuncs.c
+++ b/src/radeon_accelfuncs.c
@@ -1182,9 +1182,7 @@ FUNC_NAME(RADEONAccelInit)(ScreenPtr pScreen, XAAInfoRecPtr a)
a->SubsequentSolidHorVertLine
= FUNC_NAME(RADEONSubsequentSolidHorVertLine);
-#ifdef XFree86LOADER
if (info->xaaReq.minorversion >= 1) {
-#endif
/* RADEON only supports 14 bits for lines and clipping and only
* draws lines that are completely on-screen correctly. This will
@@ -1231,12 +1229,10 @@ FUNC_NAME(RADEONAccelInit)(ScreenPtr pScreen, XAAInfoRecPtr a)
a->DashedLineLimits.y2 = pScrn->virtualY-1;
}
-#ifdef XFree86LOADER
} else {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
"libxaa too old, can't accelerate TwoPoint lines\n");
}
-#endif
/* Clipping, note that without this, all line accelerations will
* not be called
@@ -1296,11 +1292,7 @@ FUNC_NAME(RADEONAccelInit)(ScreenPtr pScreen, XAAInfoRecPtr a)
#endif
#ifdef RENDER
- if (info->RenderAccel
-#ifdef XFree86LOADER
- && info->xaaReq.minorversion >= 2
-#endif
- ) {
+ if (info->RenderAccel && info->xaaReq.minorversion >= 2) {
a->CPUToScreenAlphaTextureFlags = XAA_RENDER_POWER_OF_2_TILE_ONLY;
a->CPUToScreenAlphaTextureFormats = RADEONTextureFormats;
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 07f96a73..cff9d0cd 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -225,197 +225,6 @@ static const OptionInfoRec RADEONOptions[] = {
const OptionInfoRec *RADEONOptionsWeak(void) { return RADEONOptions; }
-#ifdef WITH_VGAHW
-static const char *vgahwSymbols[] = {
- "vgaHWFreeHWRec",
- "vgaHWGetHWRec",
- "vgaHWGetIndex",
- "vgaHWLock",
- "vgaHWRestore",
- "vgaHWSave",
- "vgaHWUnlock",
- "vgaHWGetIOBase",
- NULL
-};
-#endif
-
-static const char *ddcSymbols[] = {
- "xf86PrintEDID",
- "xf86DoEDID_DDC1",
- "xf86DoEDID_DDC2",
- NULL
-};
-
-static const char *fbSymbols[] = {
- "fbScreenInit",
- "fbPictureInit",
- NULL
-};
-
-
-#ifdef USE_EXA
-static const char *exaSymbols[] = {
- "exaDriverAlloc",
- "exaDriverInit",
- "exaDriverFini",
- "exaOffscreenAlloc",
- "exaOffscreenFree",
- "exaGetPixmapOffset",
- "exaGetPixmapPitch",
- "exaGetPixmapSize",
- "exaMarkSync",
- "exaWaitSync",
- NULL
-};
-#endif /* USE_EXA */
-
-#ifdef USE_XAA
-static const char *xaaSymbols[] = {
- "XAACreateInfoRec",
- "XAADestroyInfoRec",
- "XAAInit",
- NULL
-};
-#endif /* USE_XAA */
-
-#if 0
-static const char *xf8_32bppSymbols[] = {
- "xf86Overlay8Plus32Init",
- NULL
-};
-#endif
-
-static const char *ramdacSymbols[] = {
- "xf86CreateCursorInfoRec",
- "xf86DestroyCursorInfoRec",
- "xf86ForceHWCursor",
- "xf86InitCursor",
- NULL
-};
-
-#ifdef XF86DRI
-static const char *drmSymbols[] = {
- "drmGetInterruptFromBusID",
- "drmCtlInstHandler",
- "drmCtlUninstHandler",
- "drmAddBufs",
- "drmAddMap",
- "drmAgpAcquire",
- "drmAgpAlloc",
- "drmAgpBase",
- "drmAgpBind",
- "drmAgpDeviceId",
- "drmAgpEnable",
- "drmAgpFree",
- "drmAgpGetMode",
- "drmAgpRelease",
- "drmAgpUnbind",
- "drmAgpVendorId",
- "drmCommandNone",
- "drmCommandRead",
- "drmCommandWrite",
- "drmCommandWriteRead",
- "drmDMA",
- "drmFreeVersion",
- "drmGetLibVersion",
- "drmGetVersion",
- "drmMap",
- "drmMapBufs",
- "drmRadeonCleanupCP",
- "drmRadeonClear",
- "drmRadeonFlushIndirectBuffer",
- "drmRadeonInitCP",
- "drmRadeonResetCP",
- "drmRadeonStartCP",
- "drmRadeonStopCP",
- "drmRadeonWaitForIdleCP",
- "drmScatterGatherAlloc",
- "drmScatterGatherFree",
- "drmUnmap",
- "drmUnmapBufs",
- NULL
-};
-
-static const char *driSymbols[] = {
- "DRICloseScreen",
- "DRICreateInfoRec",
- "DRIDestroyInfoRec",
- "DRIFinishScreenInit",
- "DRIGetContext",
- "DRIGetDeviceInfo",
- "DRIGetSAREAPrivate",
- "DRILock",
- "DRIQueryVersion",
- "DRIScreenInit",
- "DRIUnlock",
- "GlxSetVisualConfigs",
- "DRICreatePCIBusID",
- NULL
-};
-#endif
-
-static const char *vbeSymbols[] = {
- "VBEInit",
- "vbeDoEDID",
- NULL
-};
-
-static const char *int10Symbols[] = {
- "xf86InitInt10",
- "xf86FreeInt10",
- "xf86int10Addr",
- "xf86ExecX86int10",
- NULL
-};
-
-static const char *i2cSymbols[] = {
- "xf86CreateI2CBusRec",
- "xf86I2CBusInit",
- NULL
-};
-
-static const char *shadowSymbols[] = {
- "shadowAdd",
- "shadowInit",
- "shadowSetup",
- "shadowUpdatePacked",
- "shadowUpdatePackedWeak",
- NULL
-};
-
-void RADEONLoaderRefSymLists(void)
-{
- /*
- * Tell the loader about symbols from other modules that this module might
- * refer to.
- */
- xf86LoaderRefSymLists(
-#ifdef WITH_VGAHW
- vgahwSymbols,
-#endif
- fbSymbols,
-#ifdef USE_EXA
- exaSymbols,
-#endif
-#ifdef USE_XAA
- xaaSymbols,
-#endif
-#if 0
- xf8_32bppSymbols,
-#endif
- ramdacSymbols,
-#ifdef XF86DRI
- drmSymbols,
- driSymbols,
-#endif
- vbeSymbols,
- int10Symbols,
- i2cSymbols,
- ddcSymbols,
- NULL);
-}
-
-#ifdef XFree86LOADER
static int getRADEONEntityIndex(void)
{
int *radeon_entity_index = LoaderSymbol("gRADEONEntityIndex");
@@ -424,13 +233,6 @@ static int getRADEONEntityIndex(void)
else
return *radeon_entity_index;
}
-#else
-extern int gRADEONEntityIndex;
-static int getRADEONEntityIndex(void)
-{
- return gRADEONEntityIndex;
-}
-#endif
struct RADEONInt10Save {
CARD32 MEM_CNTL;
@@ -2000,7 +1802,6 @@ static Bool RADEONPreInitChipType(ScrnInfoPtr pScrn)
"using shadow framebuffer\n");
if (!xf86LoadSubModule(pScrn, "shadow"))
return FALSE;
- xf86LoaderReqSymLists(shadowSymbols, NULL);
}
return TRUE;
}
@@ -2016,16 +1817,13 @@ static void RADEONPreInitDDC(ScrnInfoPtr pScrn)
if (!xf86LoadSubModule(pScrn, "ddc")) {
info->ddc2 = FALSE;
} else {
- xf86LoaderReqSymLists(ddcSymbols, NULL);
info->ddc2 = TRUE;
}
/* DDC can use I2C bus */
/* Load I2C if we have the code to use it */
if (info->ddc2) {
- if (xf86LoadSubModule(pScrn, "i2c")) {
- xf86LoaderReqSymLists(i2cSymbols,NULL);
- }
+ xf86LoadSubModule(pScrn, "i2c");
}
}
@@ -2045,7 +1843,6 @@ static Bool RADEONPreInitCursor(ScrnInfoPtr pScrn)
if (!xf86ReturnOptValBool(info->Options, OPTION_SW_CURSOR, FALSE)) {
if (!xf86LoadSubModule(pScrn, "ramdac")) return FALSE;
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
return TRUE;
}
@@ -2053,7 +1850,6 @@ static Bool RADEONPreInitCursor(ScrnInfoPtr pScrn)
/* This is called by RADEONPreInit to initialize hardware acceleration */
static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn)
{
-#ifdef XFree86LOADER
RADEONInfoPtr info = RADEONPTR(pScrn);
MessageType from;
#if defined(USE_EXA) && defined(USE_XAA)
@@ -2101,7 +1897,6 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn)
LoaderErrorMsg(NULL, "exa", errmaj, errmin);
return FALSE;
}
- xf86LoaderReqSymLists(exaSymbols, NULL);
}
#endif /* USE_EXA */
#ifdef USE_XAA
@@ -2124,11 +1919,9 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn)
}
}
}
- xf86LoaderReqSymLists(xaaSymbols, NULL);
}
#endif /* USE_XAA */
}
-#endif /* XFree86Loader */
return TRUE;
}
@@ -2141,8 +1934,6 @@ static Bool RADEONPreInitInt10(ScrnInfoPtr pScrn, xf86Int10InfoPtr *ppInt10)
CARD32 fp2_gen_ctl_save = 0;
if (xf86LoadSubModule(pScrn, "int10")) {
- xf86LoaderReqSymLists(int10Symbols, NULL);
-
/* The VGA BIOS on the RV100/QY cannot be read when the digital output
* is enabled. Clear and restore FP2_ON around int10 to avoid this.
*/
@@ -2873,7 +2664,6 @@ _X_EXPORT Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
if (!xf86LoadSubModule(pScrn, "vgahw"))
info->VGAAccess = FALSE;
else {
- xf86LoaderReqSymLists(vgahwSymbols, NULL);
if (!vgaHWGetHWRec(pScrn))
info->VGAAccess = FALSE;
}
@@ -2989,8 +2779,6 @@ _X_EXPORT Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
/* Get ScreenInit function */
if (!xf86LoadSubModule(pScrn, "fb")) return FALSE;
- xf86LoaderReqSymLists(fbSymbols, NULL);
-
if (!RADEONPreInitGamma(pScrn)) goto fail;
if (!RADEONPreInitCursor(pScrn)) goto fail;
diff --git a/src/radeon_misc.c b/src/radeon_misc.c
index 17b987c9..7840376a 100644
--- a/src/radeon_misc.c
+++ b/src/radeon_misc.c
@@ -24,8 +24,6 @@
#include "config.h"
#endif
-#ifdef XFree86LOADER
-
#include "ativersion.h"
#include "radeon_probe.h"
@@ -70,8 +68,6 @@ RADEONSetup
if (!xf86ServerIsOnlyDetecting() && !LoaderSymbol(ATI_NAME))
xf86LoadOneModule(ATI_DRIVER_NAME, Options);
- RADEONLoaderRefSymLists();
-
Inited = TRUE;
}
@@ -85,5 +81,3 @@ _X_EXPORT XF86ModuleData radeonModuleData =
RADEONSetup,
NULL
};
-
-#endif /* XFree86LOADER */
diff --git a/src/radeon_mm_i2c.c b/src/radeon_mm_i2c.c
index cdb9437a..0524fa9c 100644
--- a/src/radeon_mm_i2c.c
+++ b/src/radeon_mm_i2c.c
@@ -410,14 +410,6 @@ void RADEONInitI2C(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
pPriv->i2c = NULL;
return;
}
- xf86LoaderReqSymbols("xf86CreateI2CBusRec",
- "xf86I2CBusInit",
- "xf86DestroyI2CBus",
- "xf86CreateI2CDevRec",
- "xf86DestroyI2CDevRec",
- "xf86I2CDevInit",
- "xf86I2CWriteRead",
- NULL);
pPriv->i2c=CreateI2CBusRec();
pPriv->i2c->scrnIndex=pScrn->scrnIndex;
pPriv->i2c->BusName="Radeon multimedia bus";
@@ -483,7 +475,6 @@ void RADEONInitI2C(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
}
else
{
- xf86LoaderReqSymbols(FI1236SymbolsList, NULL);
if(pPriv->fi1236 == NULL)
{
pPriv->fi1236 = xf86_Detect_FI1236(pPriv->i2c, FI1236_ADDR_1);
@@ -512,7 +503,6 @@ void RADEONInitI2C(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
}
else
{
- xf86LoaderReqSymbols(TDA9885SymbolsList, NULL);
if(pPriv->tda9885 == NULL)
{
pPriv->tda9885 = xf86_Detect_tda9885(pPriv->i2c, TDA9885_ADDR_1);
@@ -537,7 +527,6 @@ void RADEONInitI2C(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
}
else
{
- xf86LoaderReqSymbols(TDA9885SymbolsList, NULL);
if(pPriv->tda9885 == NULL)
{
pPriv->tda9885 = xf86_Detect_tda9885(pPriv->i2c, TDA9885_ADDR_1);
@@ -560,7 +549,6 @@ void RADEONInitI2C(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
}
else
{
- xf86LoaderReqSymbols(UDA1380SymbolsList, NULL);
if(pPriv->uda1380 == NULL)
{
pPriv->uda1380 = xf86_Detect_uda1380(pPriv->i2c, UDA1380_ADDR_1);
@@ -582,7 +570,6 @@ void RADEONInitI2C(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
}
else
{
- xf86LoaderReqSymbols(MSP3430SymbolsList, NULL);
if(pPriv->msp3430 == NULL)
{
pPriv->msp3430 = xf86_DetectMSP3430(pPriv->i2c, MSP3430_ADDR_1);
@@ -616,7 +603,6 @@ void RADEONInitI2C(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
}
else
{
- xf86LoaderReqSymbols(SAA7114SymbolsList, NULL);
if(pPriv->saa7114 == NULL)
{
pPriv->saa7114 = xf86_DetectSAA7114(pPriv->i2c, SAA7114_ADDR_1);
diff --git a/src/radeon_probe.h b/src/radeon_probe.h
index 2ee5428f..233c63a6 100644
--- a/src/radeon_probe.h
+++ b/src/radeon_probe.h
@@ -550,7 +550,6 @@ extern Bool RADEONProbe(DriverPtr, int);
extern PciChipsets RADEONPciChipsets[];
/* radeon_driver.c */
-extern void RADEONLoaderRefSymLists(void);
extern Bool RADEONPreInit(ScrnInfoPtr, int);
extern Bool RADEONScreenInit(int, ScreenPtr, int, char **);
extern Bool RADEONSwitchMode(int, DisplayModePtr, int);
diff --git a/src/radeon_video.c b/src/radeon_video.c
index de706053..29d65080 100644
--- a/src/radeon_video.c
+++ b/src/radeon_video.c
@@ -1505,8 +1505,6 @@ RADEONAllocAdaptor(ScrnInfoPtr pScrn)
xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"Unable to load Rage Theatre detect module\n");
goto skip_theatre;
}
- xf86LoaderReqSymbols(TheatreDetectSymbolsList, NULL);
-
RADEONSetupTheatre(pScrn, pPriv);
/*
@@ -1546,7 +1544,6 @@ RADEONAllocAdaptor(ScrnInfoPtr pScrn)
goto skip_theatre;
}
}
- xf86LoaderReqSymbols(TheatreSymbolsList, NULL);
}
if(pPriv->theatre!=NULL)
diff --git a/src/theatre.h b/src/theatre.h
index 3c1fd4b5..958b4438 100644
--- a/src/theatre.h
+++ b/src/theatre.h
@@ -57,25 +57,6 @@ void ResetTheatreRegsForTVout(TheatrePtr t);
void ResetTheatreRegsForNoTVout(TheatrePtr t);
-#define TheatreSymbolsList \
- "InitTheatre" \
- "RT_SetTint", \
- "RT_SetSaturation", \
- "RT_SetBrightness", \
- "RT_SetSharpness", \
- "RT_SetContrast", \
- "RT_SetInterlace", \
- "RT_SetStandard", \
- "RT_SetCombFilter", \
- "RT_SetOutputVideoSize", \
- "RT_SetConnector", \
- "ResetTheatreRegsForNoTVout", \
- "ResetTheatreRegsForTVout", \
- "DumpRageTheatreRegs", \
- "ShutdownTheatre"
-
-#ifdef XFree86LOADER
-
#define xf86_InitTheatre ((void (*)(TheatrePtr t))LoaderSymbol("InitTheatre"))
#define xf86_RT_SetTint ((void (*)(TheatrePtr, int))LoaderSymbol("RT_SetTint"))
@@ -94,24 +75,5 @@ void ResetTheatreRegsForNoTVout(TheatrePtr t);
#define xf86_ResetTheatreRegsForTVout ((void (*)(TheatrePtr))LoaderSymbol("ResetTheatreRegsForTVout"))
#define xf86_ResetTheatreRegsForNoTVout ((void (*)(TheatrePtr))LoaderSymbol("ResetTheatreRegsForNoTVout"))
#define xf86_RT_GetSignalStatus ((void (*)(TheatrePtr))LoaderSymbol("xf86_RT_GetSignalStatus"))
-#else
-
-#define xf86_InitTheatre InitTheatre
-
-#define xf86_RT_SetTint RT_SetTint
-#define xf86_RT_SetSaturation RT_SetSaturation
-#define xf86_RT_SetBrightness RT_SetBrightness
-#define xf86_RT_SetSharpness RT_SetSharpness
-#define xf86_RT_SetContrast RT_SetContrast
-#define xf86_RT_SetInterlace RT_SetInterlace
-#define xf86_RT_SetStandard RT_SetStandard
-#define xf86_RT_SetOutputVideoSize RT_SetOutputVideoSize
-#define xf86_RT_SetConnector RT_SetConnector
-
-#define xf86_RageTheatreDebugGain RageTheatreDebugGain
-#define xf86_ShutdownTheatre ShutdownTheatre
-#define xf86_DumpRageTheatreRegs DumpRageTheatreRegs
-#define xf86_ResetTheatreRegsForNoTVout ResetTheatreRegsForNoTVout
-#endif
#endif
diff --git a/src/theatre_detect.h b/src/theatre_detect.h
index b414308f..5fed160e 100644
--- a/src/theatre_detect.h
+++ b/src/theatre_detect.h
@@ -41,17 +41,6 @@
TheatrePtr DetectTheatre(GENERIC_BUS_Ptr b);
-#define TheatreDetectSymbolsList \
- "DetectTheatre"
-
-#ifdef XFree86LOADER
-
#define xf86_DetectTheatre ((TheatrePtr (*)(GENERIC_BUS_Ptr))LoaderSymbol("DetectTheatre"))
-#else
-
-#define xf86_DetectTheatre DetectTheatre
-
-#endif
-
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 07:18:34 +0000