From 408af7aa7463f4ee00bab65680a77673d575c50c Mon Sep 17 00:00:00 2001 From: Alexander Gottwald Date: Wed, 17 Mar 2004 20:30:54 +0000 Subject: merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE) --- man/savage.man | 2 +- src/savage_accel.c | 11 +++++++++-- src/savage_bci.h | 2 +- src/savage_cursor.c | 2 +- src/savage_driver.c | 2 +- src/savage_driver.h | 2 +- src/savage_image.c | 2 +- src/savage_regs.h | 2 +- src/savage_shadow.c | 2 +- src/savage_vbe.c | 2 +- src/savage_vbe.h | 2 +- src/savage_video.c | 2 +- 12 files changed, 20 insertions(+), 13 deletions(-) diff --git a/man/savage.man b/man/savage.man index 41cc1aa..f3a7a12 100644 --- a/man/savage.man +++ b/man/savage.man @@ -107,7 +107,7 @@ you would rather have the driver use your mode line timing exactly, turn off the UseBios option. Default: on (use the BIOS). .TP -.BI "Option \*qShadowStatus\*q \q*" boolean \*q +.BI "Option \*qShadowStatus\*q \*q" boolean \*q Enables the use of a shadow status register. There is a chip bug in the Savage graphics engine that can cause a bus lock when reading the engine status register under heavy load, such as when scrolling text or dragging diff --git a/src/savage_accel.c b/src/savage_accel.c index 6e16895..e995a6e 100644 --- a/src/savage_accel.c +++ b/src/savage_accel.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_accel.c,v 1.22 2003/11/03 05:11:29 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_accel.c,v 1.23 2003/12/22 17:48:10 tsi Exp $ */ /* * @@ -66,6 +66,7 @@ static void SavageSubsequentSolidBresenhamLine( int length, int octant); +#if 0 static void SavageSubsequentSolidTwoPointLine( ScrnInfoPtr pScrn, int x1, @@ -73,6 +74,7 @@ static void SavageSubsequentSolidTwoPointLine( int x2, int y2, int bias); +#endif #if 0 static void SavageSetupForScreenToScreenColorExpand( @@ -128,6 +130,7 @@ static void SavageSubsequentMono8x8PatternFillRect( int w, int h); +#if 0 static void SavageSetupForColor8x8PatternFill( ScrnInfoPtr pScrn, int patternx, @@ -144,6 +147,7 @@ static void SavageSubsequentColor8x8PatternFillRect( int y, int w, int h); +#endif static void SavageSetClippingRectangle( ScrnInfoPtr pScrn, @@ -484,7 +488,6 @@ SavageInitAccel(ScreenPtr pScreen) xaaptr->SolidLineFlags = NO_PLANEMASK | ROP_NEEDS_SOURCE; xaaptr->SetupForSolidLine = SavageSetupForSolidFill; xaaptr->SubsequentSolidBresenhamLine = SavageSubsequentSolidBresenhamLine; - xaaptr->SubsequentSolidTwoPointLine = SavageSubsequentSolidTwoPointLine; #if 0 xaaptr->SubsequentSolidFillTrap = SavageSubsequentSolidFillTrap; #endif @@ -989,6 +992,7 @@ SavageSubsequentMono8x8PatternFillRect( } +#if 0 static void SavageSetupForColor8x8PatternFill( ScrnInfoPtr pScrn, @@ -1049,6 +1053,7 @@ SavageSubsequentColor8x8PatternFillRect( BCI_SEND(BCI_X_Y(x, y)); BCI_SEND(BCI_W_H(w, h)); } +#endif static void @@ -1088,6 +1093,7 @@ SavageSubsequentSolidBresenhamLine( } +#if 0 static void SavageSubsequentSolidTwoPointLine( ScrnInfoPtr pScrn, @@ -1147,6 +1153,7 @@ SavageSubsequentSolidTwoPointLine( BCI_SEND( BCI_LINE_STEPS( 2 * (min - max), 2 * min ) ); BCI_SEND( BCI_LINE_MISC( max, ym, xp, yp, 2 * min - max ) ); } +#endif diff --git a/src/savage_bci.h b/src/savage_bci.h index 0d7c489..f5d44e3 100644 --- a/src/savage_bci.h +++ b/src/savage_bci.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_bci.h,v 1.4 2002/10/02 20:39:54 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_bci.h,v 1.3 2002/05/14 20:19:51 alanh Exp $ */ #ifndef _S3BCI_H_ #define _S3BCI_H_ diff --git a/src/savage_cursor.c b/src/savage_cursor.c index 16aaabf..60fa45d 100644 --- a/src/savage_cursor.c +++ b/src/savage_cursor.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_cursor.c,v 1.9 2003/01/18 15:22:29 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_cursor.c,v 1.7 2002/05/14 20:19:51 alanh Exp $ */ /* * Hardware cursor support for S3 Savage 4.0 driver. Taken with diff --git a/src/savage_driver.c b/src/savage_driver.c index 439587d..8415d10 100644 --- a/src/savage_driver.c +++ b/src/savage_driver.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c,v 1.49 2003/11/06 18:38:06 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c,v 1.48tsi Exp $ */ /* * vim: sw=4 ts=8 ai ic: * diff --git a/src/savage_driver.h b/src/savage_driver.h index b25fc56..4375302 100644 --- a/src/savage_driver.h +++ b/src/savage_driver.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.h,v 1.17 2003/04/23 14:18:37 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.h,v 1.16 2003/01/18 15:22:30 eich Exp $ */ #ifndef SAVAGE_VGAHWMMIO_H #define SAVAGE_VGAHWMMIO_H diff --git a/src/savage_image.c b/src/savage_image.c index 8354622..8b9605b 100644 --- a/src/savage_image.c +++ b/src/savage_image.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_image.c,v 1.6 2002/05/14 20:19:52 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_image.c,v 1.4 2001/05/18 23:35:32 dawes Exp $ */ #include "savage_driver.h" #include "xaarop.h" diff --git a/src/savage_regs.h b/src/savage_regs.h index 8913f95..0f807a1 100644 --- a/src/savage_regs.h +++ b/src/savage_regs.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h,v 1.13 2003/04/23 14:18:37 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h,v 1.11 2002/05/14 20:19:52 alanh Exp $ */ #ifndef _SAVAGE_REGS_H #define _SAVAGE_REGS_H diff --git a/src/savage_shadow.c b/src/savage_shadow.c index 00a5120..2fb0e91 100644 --- a/src/savage_shadow.c +++ b/src/savage_shadow.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_shadow.c,v 1.2 2002/05/14 20:19:52 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_shadow.c,v 1.3 2000/03/31 20:13:33 dawes Exp $ */ /* Copyright (c) 1999,2000 The XFree86 Project Inc. diff --git a/src/savage_vbe.c b/src/savage_vbe.c index cf8f417..ea37260 100644 --- a/src/savage_vbe.c +++ b/src/savage_vbe.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_vbe.c,v 1.14 2003/06/18 16:17:40 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_vbe.c,v 1.11 2002/05/14 20:19:52 alanh Exp $ */ #include "savage_driver.h" #include "savage_vbe.h" diff --git a/src/savage_vbe.h b/src/savage_vbe.h index ba77773..70bebd3 100644 --- a/src/savage_vbe.h +++ b/src/savage_vbe.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_vbe.h,v 1.3 2002/05/14 20:19:52 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_vbe.h,v 1.1 2000/12/02 01:16:15 dawes Exp $ */ /* This file was originally part of the Linux Real-Mode Interface, or LRMI. diff --git a/src/savage_video.c b/src/savage_video.c index 7773e99..4e9b5f3 100644 --- a/src/savage_video.c +++ b/src/savage_video.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_video.c,v 1.18 2003/11/10 18:22:26 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_video.c,v 1.17tsi Exp $ */ #include "Xv.h" #include "dix.h" -- cgit v1.2.3