diff options
| author | Francisco Jerez <currojerez@gmail.com> | 2008-08-16 12:40:52 +0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-08-16 19:16:28 -0300 |
| commit | 8feca790a6e92799019237ac69a4ef618cacfaae (patch) | |
| tree | 0c08cca92d59fbe22132665e9cdc76de8d969a4e | |
| parent | 772e899e71efab208b844b09c75f9f49ff453386 (diff) | |
Make the int10/VBE initialization depend on the UseBIOS configuration option.
Signed-off-by: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
| -rw-r--r-- | src/smi_driver.c | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/src/smi_driver.c b/src/smi_driver.c index 12be909..a29fddc 100644 --- a/src/smi_driver.c +++ b/src/smi_driver.c @@ -791,14 +791,16 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags) return FALSE; } - if (xf86LoadSubModule(pScrn,"int10")) { - xf86LoaderReqSymLists(int10Symbols,NULL); - pSmi->pInt10 = xf86InitInt10(pEnt->index); - } + if(pSmi->useBIOS){ + if (xf86LoadSubModule(pScrn,"int10")) { + xf86LoaderReqSymLists(int10Symbols,NULL); + pSmi->pInt10 = xf86InitInt10(pEnt->index); + } - if (pSmi->pInt10 && xf86LoadSubModule(pScrn, "vbe")) { - xf86LoaderReqSymLists(vbeSymbols, NULL); - pVbe = VBEInit(pSmi->pInt10, pEnt->index); + if (pSmi->pInt10 && xf86LoadSubModule(pScrn, "vbe")) { + xf86LoaderReqSymLists(vbeSymbols, NULL); + pVbe = VBEInit(pSmi->pInt10, pEnt->index); + } } pSmi->PciInfo = xf86GetPciInfoForEntity(pEnt->index); @@ -982,9 +984,11 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags) } } - vbeFree(pVbe); - xf86FreeInt10(pSmi->pInt10); - pSmi->pInt10 = NULL; + if(pSmi->useBIOS){ + vbeFree(pVbe); + xf86FreeInt10(pSmi->pInt10); + pSmi->pInt10 = NULL; + } /* * If the driver can do gamma correction, it should call xf86SetGamma() @@ -2032,7 +2036,7 @@ SMI_ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) pEnt = xf86GetEntityInfo(pScrn->entityList[0]); - if (!pSmi->pInt10) { + if (!pSmi->pInt10 && pSmi->useBIOS) { pSmi->pInt10 = xf86InitInt10(pEnt->index); } |