Fix install problem on platforms not using xorg.cf/xfree86.cf (Bug #339,XORG-6_7_99_2XORG-6_7_99_1

    Harold L. Hunt II, Alexander Gottwald).
Fix crash when using X core font in zh_CN.UTF-8 locale (Bug #368, Yu Shao,
    David Dawes).
Fix glXMakeCurrent(Dpy, None, NULL) crash (Bug #719, Adam Jackson).
HP-PA build fix (Bug #828, Guy Martin, Paul Anderson).
Fix SDK build for GATOS and Wacom driver (Bug #829, Bryan Stine).
Fix attempt to read video ROM before enabling it (Bug #843, Ivan
    Kokshaysky, Mike A. Harris).
Fix detection of primary adapter (Bug #843, Ivan Kokshaysky, Mike A.
    Harris).
Clarify xset man page description of how to use the keyboard repeat rate
    settings (Bug #846, Mike A. Harris).
Fix problem where print-screen key would get remapped to sys-req in certain
    keymaps, which broke GNOME printscreen functionality (Bug #847, Owen
    Taylor).
Fix several render problems:
- MMIO mode support
- Hang on IGP chips
- VT switching hang
- 3D render corruption (Bug #922, Hui Yu).

1 files changed, 3 insertions, 4 deletions

diff --git a/src/mga_driver.c b/src/mga_driver.c
index 12656d8..30aa691 100644
--- a/src/mga_driver.c
+++ b/src/mga_driver.c
@@ -708,10 +708,6 @@ MGAReadBios(ScrnInfoPtr pScrn)
 	pBios = &pMga->Bios;
 	pBios2 = &pMga->Bios2;
         
-	/* Get the output mode set by the BIOS */
-	xf86ReadDomainMemory(pMga->PciTag, pMga->BiosAddress + 0x7ff1u,
-			     sizeof(CARD8), &pMga->BiosOutputMode); 
-
 	/*
 	 * If the BIOS address was probed, it was found from the PCI config
 	 * space.  If it was given in the config file, try to guess when it
@@ -735,6 +731,9 @@ MGAReadBios(ScrnInfoPtr pScrn)
 		return;
 	}
         
+	/* Get the output mode set by the BIOS */
+	pMga->BiosOutputMode = BIOS[0x7ff1];
+
         /* Get the video BIOS info block */
 	if (strncmp((char *)(&BIOS[45]), "MATROX", 6)) {
 		xf86DrvMsg(pScrn->scrnIndex, X_WARNING,