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 | fc56eac7f9e9ee6fdca34782e786b0d65b3db5d1 (patch) | |
| tree | 740e5809baf15296fbfdcc02e7e7bcb4815b82c9 | |
| parent | 3ff738aee5c60a51cddb7ad08f7d96d0376590a0 (diff) | |
Bug #400 (partial): Driver fixes for the dlloader. When using dlloader, all
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/glint_driver.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/glint_driver.c b/src/glint_driver.c index 595e2dd..cdfdbaf 100644 --- a/src/glint_driver.c +++ b/src/glint_driver.c @@ -933,7 +933,7 @@ GLINTProbeTIramdac(ScrnInfoPtr pScrn) pGlint->RamDacRec->WriteAddress = glintTIWriteAddress; pGlint->RamDacRec->ReadData = glintTIReadData; pGlint->RamDacRec->WriteData = glintTIWriteData; - pGlint->RamDacRec->LoadPalette = TIramdacLoadPalette; + pGlint->RamDacRec->LoadPalette = LoaderSymbol("TIramdacLoadPalette"); if(!RamDacInit(pScrn, pGlint->RamDacRec)) { RamDacDestroyInfoRec(pGlint->RamDacRec); @@ -1248,9 +1248,9 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) pGlint->FBDev = TRUE; from = X_CONFIG; - pScrn->AdjustFrame = fbdevHWAdjustFrame; - pScrn->LeaveVT = fbdevHWLeaveVT; - pScrn->ValidMode = fbdevHWValidMode; + pScrn->AdjustFrame = LoaderSymbol("fbdevHWAdjustFrame"); + pScrn->LeaveVT = LoaderSymbol("fbdevHWLeaveVT"); + pScrn->ValidMode = LoaderSymbol("fbdevHWValidMode"); } else { /* Only use FBDev if requested */ @@ -3104,7 +3104,7 @@ GLINTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA) && (pGlint->MultiChip == PCI_CHIP_PERMEDIA3)) ) { if (!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits, - (pGlint->FBDev) ? fbdevHWLoadPalette : + (pGlint->FBDev) ? LoaderSymbol("fbdevHWLoadPalette") : ((pScrn->depth == 16) ? Permedia3LoadPalette16:Permedia3LoadPalette), NULL, CMAP_RELOAD_ON_MODE_SWITCH | @@ -3116,7 +3116,7 @@ GLINTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_PERMEDIA2) || (pGlint->Chipset == PCI_VENDOR_TI_CHIP_PERMEDIA2)) { if (!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits, - (pGlint->FBDev) ? fbdevHWLoadPalette : + (pGlint->FBDev) ? LoaderSymbol("fbdevHWLoadPalette") : ((pScrn->depth == 16) ? Permedia2LoadPalette16:Permedia2LoadPalette), NULL, CMAP_RELOAD_ON_MODE_SWITCH | |