PATCH: Fix some VGA issues

Fix some issues from the recent NoVGA refactoring
This commit is contained in:
Jordan Crouse
2006-07-07 17:18:06 -06:00
parent 726d46c8da
commit 3718e9e263

View File

@@ -611,21 +611,21 @@ GXPreInit(ScrnInfoPtr pScrni, int flags)
if (!xf86LoadSubModule(pScrni, "int10"))
return FALSE;
xf86LoaderReqSymLists(amdInt10Symbols, NULL);
pVesa = pGeode->vesa;
if ((pVesa->pInt = xf86InitInt10(pGeode->pEnt->index)) == NULL)
DEBUGMSG(1, (pScrni->scrnIndex, X_ERROR,
"Unable to initialize INT10 support\n"));
return FALSE;
if ((pVesa->pInt = xf86InitInt10(pGeode->pEnt->index)) == NULL) {
DEBUGMSG(1, (pScrni->scrnIndex, X_ERROR,
"Unable to initialize INT10 support\n"));
return FALSE;
}
#endif
if (!xf86LoadSubModule(pScrni, "vgahw"))
return FALSE;
return FALSE;
xf86LoaderReqSymLists(amdVgahwSymbols, NULL);
pGeode->FBVGAActive = gu2_get_vga_active();
pGeode->FBAvail = gfx_get_frame_buffer_size();
}
else {
@@ -637,6 +637,11 @@ GXPreInit(ScrnInfoPtr pScrni, int flags)
if (!GXMapMem(pScrni))
return FALSE;
pGeode->FBVGAActive = FALSE;
if (pGeode->useVGA)
pGeode->FBVGAActive = gu2_get_vga_active();
/*Set the bits per RGB for 8bpp mode */
if (pScrni->depth == 8)