[PATCH xf86-video-mga 4/4] Remove calls to xf86IsPc98()

[Jamey Sharp]

Reviewed-by: Jamey Sharp <jamey at minilop.net>

On Mon, Sep 26, 2011 at 10:41:52PM -0400, Matt Turner wrote:
> Signed-off-by: Matt Turner <mattst88 at gmail.com>
> ---
>  src/mga_driver.c |   14 +-------------
>  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);
>  
>      
> -- 
> 1.7.3.4
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.x.org/archives/xorg-devel/attachments/20110926/6efdbf78/attachment.pgp>