diff options
| author | Matt Turner <mattst88@gmail.com> | 2011-09-26 22:38:17 -0400 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2011-09-27 22:48:21 -0400 |
| commit | 07792ef41f33aa5419168263637e34ee614f26e2 (patch) | |
| tree | c5d19ea5b865039f5733fa07b6137a7b74b4edce | |
| parent | 560967b4ffdb103f95121c43708dd5fc680a5045 (diff) | |
Remove calls to xf86IsPc98()
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Matt Turner <mattst88@gmail.com>
| -rw-r--r-- | src/mga_driver.c | 14 | ||||
| -rw-r--r-- | src/mga_merge.c | 2 |
2 files changed, 2 insertions, 14 deletions
diff --git a/src/mga_driver.c b/src/mga_driver.c index dcbfabf..4af36ca 100644 --- a/src/mga_driver.c +++ b/src/mga_driver.c @@ -2164,7 +2164,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) /* * Reset card if it isn't primary one */ - if ( (!pMga->Primary && !pMga->FBDev) || xf86IsPc98() ) + if ( (!pMga->Primary && !pMga->FBDev) ) MGASoftReset(pScrn); if (pScrn->videoRam == 0) { @@ -2878,13 +2878,6 @@ MGAModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) vgaHWProtect(pScrn, FALSE); } - if (xf86IsPc98()) { - if (pMga->Chipset == PCI_CHIP_MGA2064) - outb(0xfac, 0x01); - else - outb(0xfac, 0x02); - } - /* Reset tagfifo*/ if (pMga->is_G200ER) { @@ -3680,8 +3673,6 @@ MGALeaveVT(int scrnIndex, int flags) MGARestore(pScrn); vgaHWLock(hwp); - if (xf86IsPc98()) - outb(0xfac, 0x00); #ifdef XF86DRI if (pMga->directRenderingEnabled) { pScreen = screenInfo.screens[scrnIndex]; @@ -3755,9 +3746,6 @@ MGACloseScreen(int scrnIndex, ScreenPtr pScreen) pScrn->vtSema = FALSE; - if (xf86IsPc98()) - outb(0xfac, 0x00); - xf86ClearPrimInitDone(pScrn->entityList[0]); if(pMga->BlockHandler) diff --git a/src/mga_merge.c b/src/mga_merge.c index c1cf2eb..aec3443 100644 --- a/src/mga_merge.c +++ b/src/mga_merge.c @@ -385,7 +385,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags) /* * Reset card if it isn't primary one */ - if ( (!pMga->Primary && !pMga->FBDev) || xf86IsPc98() ) + if ( (!pMga->Primary && !pMga->FBDev) ) MGASoftReset(pScrn); |