diff options
| author | dawes <dawes> | 2003-12-24 02:36:41 +0000 |
|---|---|---|
| committer | dawes <dawes> | 2003-12-24 02:36:41 +0000 |
| commit | c564fa2e2cf83e1014c6684c4ac09f7ebffbf19f (patch) | |
| tree | 71b9025fcf8e17e3da6684acd304ff75da5b416c | |
| parent | 4424461fedbffa9961b3c00c44b6bef0258d2d25 (diff) | |
703. Disable Xv in the via driver when acceleration is disabled (Alan Cox).
| -rw-r--r-- | programs/Xserver/hw/xfree86/CHANGELOG | 3 | ||||
| -rw-r--r-- | programs/Xserver/hw/xfree86/drivers/via/via_driver.c | 11 |
2 files changed, 7 insertions, 7 deletions
diff --git a/programs/Xserver/hw/xfree86/CHANGELOG b/programs/Xserver/hw/xfree86/CHANGELOG index b85a527b6..c0fdcd3eb 100644 --- a/programs/Xserver/hw/xfree86/CHANGELOG +++ b/programs/Xserver/hw/xfree86/CHANGELOG @@ -1,4 +1,5 @@ XFree86 4.3.99.903 (xx December 2003) + 703. Disable Xv in the via driver when acceleration is disabled (Alan Cox). 702. Fix bugs caused by empty PCI buses on ZX1-based systems (Marc La France). 701. Fix optional save/restore of BIOS area data in int10 module (Marc La France). @@ -18405,7 +18406,7 @@ XFree86 3.0a (28 April 1994) XFree86 3.0 (26 April 1994) -$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3050 2003/12/23 22:21:51 dickey Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3051 2003/12/23 22:46:38 tsi Exp $ diff --git a/programs/Xserver/hw/xfree86/drivers/via/via_driver.c b/programs/Xserver/hw/xfree86/drivers/via/via_driver.c index 8d7781045..cf97cafe8 100644 --- a/programs/Xserver/hw/xfree86/drivers/via/via_driver.c +++ b/programs/Xserver/hw/xfree86/drivers/via/via_driver.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/via/via_driver.c,v 1.16 2003/10/31 17:19:35 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/via/via_driver.c,v 1.17 2003/12/17 18:57:18 dawes Exp $ */ /* * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved. * Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved. @@ -2427,12 +2427,11 @@ static Bool VIAScreenInit(int scrnIndex, ScreenPtr pScreen, if (VIA_SERIES(pVia->Chipset) && !pVia->IsSecondary) { viaFillGraphicInfo(pScrn); - /* There is alas not enough bandwidth to do 1600x1200x16 with video overlay */ -/* if(pScrn->bitsPerPixel * pScrn->virtualX *pScrn->virtualY <= 1400 * 1050 * 16) */ + if(!pVia->NoAccel) viaInitVideo(pScreen); -/* else - xf86DrvMsg(pScrn->scrnIndex, X_INFO, "video overlay disabled (%dx%d@%d exceeds bandwidth)\n", - pScrn->virtualX, pScrn->virtualY, pScrn->bitsPerPixel);*/ + else + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Acceleration disabled; no Xvideo support.\n", + pScrn->virtualX, pScrn->virtualY); } if (serverGeneration == 1) |