diff options
| author | George Sapountzis <gsap7@yahoo.gr> | 2007-03-23 21:30:19 +0200 |
|---|---|---|
| committer | George Sapountzis <gsap7@yahoo.gr> | 2007-03-23 23:27:35 +0200 |
| commit | 58626d8b78f26f0d9c480033d3c3a12e541342b1 (patch) | |
| tree | edddc652646f6b4f1fde570a7208caed4f729213 /src/radeon_probe.c | |
| parent | 166c760a86165330175023e07c4b2bd6891633c5 (diff) | |
Move {atimach64,r128,radeon}_probe.c from ati to subdrivers.
Subdrivers are now loaded from the wrapper Probe function rather than at screen
creation time.
The wrapper Identify callback only prints chip families now, chip lists are
printed when a subdriver is loaded. This also avoids duplication of subdriver
Identify callbacks.
Unknown radeons should still get a list of known radeon and then probe fails...
Probe for atimisc last to avoid needless loading in most cases (r128, radeon).
Diffstat (limited to 'src/radeon_probe.c')
| -rw-r--r-- | src/radeon_probe.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/radeon_probe.c b/src/radeon_probe.c index 98b35aa6..4ff11ea5 100644 --- a/src/radeon_probe.c +++ b/src/radeon_probe.c @@ -200,7 +200,7 @@ PciChipsets RADEONPciChipsets[] = { int gRADEONEntityIndex = -1; /* Return the options for supported chipset 'n'; NULL otherwise */ -const OptionInfoRec * +_X_EXPORT const OptionInfoRec * RADEONAvailableOptions(int chipid, int busid) { int i; @@ -219,7 +219,7 @@ RADEONAvailableOptions(int chipid, int busid) } /* Return the string name for supported chipset 'n'; NULL otherwise. */ -void +_X_EXPORT void RADEONIdentify(int flags) { xf86PrintChipsets(RADEON_NAME, @@ -228,7 +228,7 @@ RADEONIdentify(int flags) } /* Return TRUE if chipset is present; FALSE otherwise. */ -Bool +_X_EXPORT Bool RADEONProbe(DriverPtr drv, int flags) { int numUsed; @@ -285,17 +285,6 @@ RADEONProbe(DriverPtr drv, int flags) if ((pScrn = xf86ConfigPciEntity(pScrn, 0, usedChips[i], RADEONPciChipsets, 0, 0, 0, 0, 0))) { -#ifdef XFree86LOADER - if (!xf86LoadSubModule(pScrn, "radeon")) { - xf86Msg(X_ERROR, RADEON_NAME - ": Failed to load \"radeon\" module.\n"); - xf86DeleteScreen(pScrn->scrnIndex, 0); - continue; - } - - xf86LoaderReqSymLists(RADEONSymbols, NULL); -#endif - pScrn->Probe = RADEONProbe; RADEONFillInScreenInfo(pScrn); foundScreen = TRUE; |