diff options
| author | Adam Jackson <ajax@nwnk.net> | 2004-07-30 20:30:52 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2004-07-30 20:30:52 +0000 |
| commit | 979f1e0c830891c9e4f0b4837980766cc7eac3d7 (patch) | |
| tree | 41fb86a03ab1d2d191f82b84db522571fb72ce9f | |
| parent | c15b8a386fc6915e2ec13b0b8b9a15eb7277d665 (diff) | |
Bug #400 (partial): Driver fixes for the dlloader. When using dlloader, allxprint_packagertest_20041217_basexprint_packagertest_20041125_baserel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_99_3XORG-6_8_99_2XORG-6_8_99_1XORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1xprint_packagertest_20041217xprint_packagertest_20041125lg3d-masterlg3d-eventlg3d-dev-0-7-1lg3d-dev-0-7-0lg3d-dev-0-6-latestlg3d-dev-0-6-2lg3d-dev-0-6-1-latestlg3d-dev-0-6-1-currentlg3d-dev-0-6-1-1lg3d-dev-0-6-1lg3dXORG-6_8-branch
framebuffer formats except cfb and the overlay modes should work, and
r128 and radeon need to be loaded from the ati driver (both issues to
be fixed soon). Tested on i740, s3virge, mach64, tdfx, vesa, and vga
drivers. elfloader users shouldn't be affected.
| -rw-r--r-- | src/cir_driver.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/cir_driver.c b/src/cir_driver.c index 737eb3f..8febbad 100644 --- a/src/cir_driver.c +++ b/src/cir_driver.c @@ -11,7 +11,7 @@ * Guy DESBIEF */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_driver.c,v 1.69 2003/06/18 16:17:38 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_driver.c,v 1.67 2001/05/15 10:19:37 eich Exp $ */ /* All drivers should typically include these */ #include "xf86.h" @@ -143,7 +143,7 @@ static XF86ModuleVersionInfo cirVersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, CIR_MAJOR_VERSION, CIR_MINOR_VERSION, CIR_PATCHLEVEL, ABI_CLASS_VIDEODRV, /* This is a video driver */ ABI_VIDEODRV_VERSION, @@ -218,7 +218,6 @@ CIRProbe(DriverPtr drv, int flags) int numDevSections; int numUsed; Bool foundScreen = FALSE; - ScrnInfoPtr (*subProbe)(int entity); ScrnInfoPtr pScrn; #ifdef CIR_DEBUG @@ -275,6 +274,7 @@ CIRProbe(DriverPtr drv, int flags) they should be handled in this driver (as opposed to their own driver). */ pPci = xf86GetPciInfoForEntity(usedChips[i]); + pScrn = NULL; if (pPci && (pPci->chipType == PCI_CHIP_GD5462 || pPci->chipType == PCI_CHIP_GD5464 || pPci->chipType == PCI_CHIP_GD5464BD || @@ -286,7 +286,7 @@ CIRProbe(DriverPtr drv, int flags) xf86LoaderReqSymLists(lgSymbols, NULL); lg_loaded = TRUE; } - subProbe = LgProbe; + pScrn = LgProbe(usedChips[i]); } else { if (!alp_loaded) { if (!xf86LoadDrvSubModule(drv, "cirrus_alpine")) @@ -294,11 +294,10 @@ CIRProbe(DriverPtr drv, int flags) xf86LoaderReqSymLists(alpSymbols, NULL); alp_loaded = TRUE; } - subProbe = AlpProbe; + pScrn = AlpProbe(usedChips[i]); } - pScrn = NULL; - if ((pScrn = subProbe(usedChips[i]))) { + if (pScrn) { foundScreen = TRUE; /* Fill in what we can of the ScrnInfoRec */ pScrn->driverVersion = VERSION; |