diff options
| author | Jordan Crouse <jordan.crouse@amd.com> | 2006-07-07 17:18:06 -0600 |
|---|---|---|
| committer | Jordan Crouse <jordan.crouse@amd.com> | 2006-07-07 17:45:29 -0600 |
| commit | 3718e9e2639d0f6313c3ec9ab32d277d2224f8cf (patch) | |
| tree | 00269f6e0ba9e4d868fb076fa8bc9f2fc644fd76 | |
| parent | 726d46c8da96b2a0168b39d36be32467d54a9de3 (diff) | |
PATCH: Fix some VGA issues
Fix some issues from the recent NoVGA refactoring
| -rw-r--r-- | src/amd_gx_driver.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/src/amd_gx_driver.c b/src/amd_gx_driver.c index 58e3c64..7f181f0 100644 --- a/src/amd_gx_driver.c +++ b/src/amd_gx_driver.c @@ -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) |