diff options
-rw-r--r-- | src/common.h | 1 | ||||
-rw-r--r-- | src/i810.h | 1 | ||||
-rw-r--r-- | src/i810_accel.c | 14 | ||||
-rw-r--r-- | src/i810_common.h | 1 | ||||
-rw-r--r-- | src/i810_cursor.c | 14 | ||||
-rw-r--r-- | src/i810_dga.c | 14 | ||||
-rw-r--r-- | src/i810_dri.c | 14 | ||||
-rw-r--r-- | src/i810_dri.h | 1 | ||||
-rw-r--r-- | src/i810_driver.c | 14 | ||||
-rw-r--r-- | src/i810_hwmc.c | 1 | ||||
-rw-r--r-- | src/i810_io.c | 14 | ||||
-rw-r--r-- | src/i810_memory.c | 14 | ||||
-rw-r--r-- | src/i810_reg.h | 1 | ||||
-rw-r--r-- | src/i810_video.c | 1 | ||||
-rw-r--r-- | src/i810_wmark.c | 15 | ||||
-rw-r--r-- | src/i830.h | 1 | ||||
-rw-r--r-- | src/i830_accel.c | 30 | ||||
-rw-r--r-- | src/i830_common.h | 1 | ||||
-rw-r--r-- | src/i830_cursor.c | 14 | ||||
-rw-r--r-- | src/i830_dri.c | 26 | ||||
-rw-r--r-- | src/i830_dri.h | 1 | ||||
-rw-r--r-- | src/i830_driver.c | 124 | ||||
-rw-r--r-- | src/i830_memory.c | 14 | ||||
-rw-r--r-- | src/i830_video.c | 1 | ||||
-rw-r--r-- | src/xvmc/I810XvMC.c | 1 | ||||
-rw-r--r-- | src/xvmc/I810XvMC.h | 1 | ||||
-rw-r--r-- | src/xvmc/xf86dri.c | 1 | ||||
-rw-r--r-- | src/xvmc/xf86dri.h | 1 | ||||
-rw-r--r-- | src/xvmc/xf86dristr.h | 1 |
29 files changed, 8 insertions, 329 deletions
diff --git a/src/common.h b/src/common.h index 1576d3a1..ab7a6538 100644 --- a/src/common.h +++ b/src/common.h @@ -27,7 +27,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/common.h,v 1.9 2003/09/24 02:43:23 dawes Exp $ */ /* * Authors: @@ -27,7 +27,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810.h,v 1.41 2003/06/18 13:14:17 dawes Exp $ */ /* * Authors: diff --git a/src/i810_accel.c b/src/i810_accel.c index 1f859b8a..ae4a6544 100644 --- a/src/i810_accel.c +++ b/src/i810_accel.c @@ -25,26 +25,12 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_accel.c,v 1.21 2004/01/02 20:22:17 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" #endif /* - * Reformatted with GNU indent (2.2.8), using the following options: - * - * -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78 - * -lp -npcs -psl -sob -ss -br -ce -sc -hnl - * - * This provides a good match with the original i810 code and preferred - * XFree86 formatting conventions. - * - * When editing this driver, please follow the existing formatting, and edit - * with <TAB> characters expanded at 8-column intervals. - */ - -/* * Authors: * Keith Whitwell <keith@tungstengraphics.com> * diff --git a/src/i810_common.h b/src/i810_common.h index 02e548be..29be444b 100644 --- a/src/i810_common.h +++ b/src/i810_common.h @@ -25,7 +25,6 @@ * Converted to common header format: * Jens Owen <jens@tungstengraphics.com> * - * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_common.h,v 1.1 2002/09/11 00:29:31 dawes Exp $ * */ diff --git a/src/i810_cursor.c b/src/i810_cursor.c index 30f42d14..898a1364 100644 --- a/src/i810_cursor.c +++ b/src/i810_cursor.c @@ -25,26 +25,12 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_cursor.c,v 1.6 2002/09/11 00:29:31 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" #endif /* - * Reformatted with GNU indent (2.2.8), using the following options: - * - * -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78 - * -lp -npcs -psl -sob -ss -br -ce -sc -hnl - * - * This provides a good match with the original i810 code and preferred - * XFree86 formatting conventions. - * - * When editing this driver, please follow the existing formatting, and edit - * with <TAB> characters expanded at 8-column intervals. - */ - -/* * Authors: * Keith Whitwell <keith@tungstengraphics.com> * diff --git a/src/i810_dga.c b/src/i810_dga.c index 4ab7a3df..3f530579 100644 --- a/src/i810_dga.c +++ b/src/i810_dga.c @@ -21,20 +21,6 @@ * * Authors: Alan Hourihane, <alanh@fairlite.demon.co.uk> */ -/* - * Reformatted with GNU indent (2.2.8), using the following options: - * - * -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78 - * -lp -npcs -psl -sob -ss -br -ce -sc -hnl - * - * This provides a good match with the original i810 code and preferred - * XFree86 formatting conventions. - * - * When editing this driver, please follow the existing formatting, and edit - * with <TAB> characters expanded at 8-column intervals. - */ - -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dga.c,v 1.5 2002/09/11 00:29:31 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/i810_dri.c b/src/i810_dri.c index 00691af7..e566acf6 100644 --- a/src/i810_dri.c +++ b/src/i810_dri.c @@ -1,17 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c,v 1.41 2003/09/24 02:43:23 dawes Exp $ */ -/* - * Reformatted with GNU indent (2.2.8), using the following options: - * - * -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78 - * -lp -npcs -psl -sob -ss -br -ce -sc -hnl - * - * This provides a good match with the original i810 code and preferred - * XFree86 formatting conventions. - * - * When editing this driver, please follow the existing formatting, and edit - * with <TAB> characters expanded at 8-column intervals. - */ - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/i810_dri.h b/src/i810_dri.h index 5aa43383..16b6f087 100644 --- a/src/i810_dri.h +++ b/src/i810_dri.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.h,v 1.10 2002/12/10 01:27:04 dawes Exp $ */ #ifndef _I810_DRI_ #define _I810_DRI_ diff --git a/src/i810_driver.c b/src/i810_driver.c index 263e8d92..627cffc8 100644 --- a/src/i810_driver.c +++ b/src/i810_driver.c @@ -25,26 +25,12 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c,v 1.101 2004/01/02 20:15:47 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" #endif /* - * Reformatted with GNU indent (2.2.8), using the following options: - * - * -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78 - * -lp -npcs -psl -sob -ss -br -ce -sc -hnl - * - * This provides a good match with the original i810 code and preferred - * XFree86 formatting conventions. - * - * When editing this driver, please follow the existing formatting, and edit - * with <TAB> characters expanded at 8-column intervals. - */ - -/* * Authors: * Keith Whitwell <keith@tungstengraphics.com> * diff --git a/src/i810_hwmc.c b/src/i810_hwmc.c index d56dfc40..12ffdd93 100644 --- a/src/i810_hwmc.c +++ b/src/i810_hwmc.c @@ -32,7 +32,6 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE. * * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_hwmc.c,v 1.3 2001/12/04 21:17:56 tsi Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/src/i810_io.c b/src/i810_io.c index 3fd8e4e3..a6cf3058 100644 --- a/src/i810_io.c +++ b/src/i810_io.c @@ -24,26 +24,12 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_io.c,v 1.4 2002/01/25 21:56:04 tsi Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" #endif /* - * Reformatted with GNU indent (2.2.8), using the following options: - * - * -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78 - * -lp -npcs -psl -sob -ss -br -ce -sc -hnl - * - * This provides a good match with the original i810 code and preferred - * XFree86 formatting conventions. - * - * When editing this driver, please follow the existing formatting, and edit - * with <TAB> characters expanded at 8-column intervals. - */ - -/* * Authors: * Daryll Strauss <daryll@precisioninsight.com> * diff --git a/src/i810_memory.c b/src/i810_memory.c index 222b5cf7..f57ddbe2 100644 --- a/src/i810_memory.c +++ b/src/i810_memory.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_memory.c,v 1.27 2002/12/10 01:27:05 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. @@ -31,19 +30,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #endif /* - * Reformatted with GNU indent (2.2.8), using the following options: - * - * -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78 - * -lp -npcs -psl -sob -ss -br -ce -sc -hnl - * - * This provides a good match with the original i810 code and preferred - * XFree86 formatting conventions. - * - * When editing this driver, please follow the existing formatting, and edit - * with <TAB> characters expanded at 8-column intervals. - */ - -/* * Authors: * Keith Whitwell <keith@tungstengraphics.com> * diff --git a/src/i810_reg.h b/src/i810_reg.h index d5d41b3e..8d4e6418 100644 --- a/src/i810_reg.h +++ b/src/i810_reg.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_reg.h,v 1.13 2003/02/06 04:18:04 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/src/i810_video.c b/src/i810_video.c index 418f2952..9528bc7f 100644 --- a/src/i810_video.c +++ b/src/i810_video.c @@ -23,7 +23,6 @@ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_video.c,v 1.26 2003/11/10 18:22:22 tsi Exp $ */ /* * i810_video.c: i810 Xv driver. Based on the mga Xv driver by Mark Vojkovich. diff --git a/src/i810_wmark.c b/src/i810_wmark.c index d21f6aa5..71b2a825 100644 --- a/src/i810_wmark.c +++ b/src/i810_wmark.c @@ -1,4 +1,3 @@ - /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. @@ -25,20 +24,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_wmark.c,v 1.7 2002/09/11 00:29:32 dawes Exp $ */ - -/* - * Reformatted with GNU indent (2.2.8), using the following options: - * - * -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78 - * -lp -npcs -psl -sob -ss -br -ce -sc -hnl - * - * This provides a good match with the original i810 code and preferred - * XFree86 formatting conventions. - * - * When editing this driver, please follow the existing formatting, and edit - * with <TAB> characters expanded at 8-column intervals. - */ /* * Authors: @@ -26,7 +26,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830.h,v 1.12 2004/01/07 03:43:19 dawes Exp $ */ /* * Authors: diff --git a/src/i830_accel.c b/src/i830_accel.c index 589f86de..b365e3f9 100644 --- a/src/i830_accel.c +++ b/src/i830_accel.c @@ -1,12 +1,3 @@ -/* - * XXX So far, for GXxor this is about 40% of the speed of SW, but CPU - * utilisation falls from 95% to < 5%. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. @@ -33,27 +24,22 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_accel.c,v 1.8 2003/04/24 18:00:24 eich Exp $ */ /* - * Reformatted with GNU indent (2.2.8), using the following options: - * - * -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78 - * -lp -npcs -psl -sob -ss -br -ce -sc -hnl - * - * This provides a good match with the original i810 code and preferred - * XFree86 formatting conventions. + * Authors: + * Keith Whitwell <keith@tungstengraphics.com> * - * When editing this driver, please follow the existing formatting, and edit - * with <TAB> characters expanded at 8-column intervals. */ /* - * Authors: - * Keith Whitwell <keith@tungstengraphics.com> - * + * XXX So far, for GXxor this is about 40% of the speed of SW, but CPU + * utilisation falls from 95% to < 5%. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <errno.h> #include "xf86.h" diff --git a/src/i830_common.h b/src/i830_common.h index eeb2ed76..e9795a29 100644 --- a/src/i830_common.h +++ b/src/i830_common.h @@ -26,7 +26,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_common.h,v 1.1 2002/09/11 00:29:32 dawes Exp $ */ #ifndef _I830_COMMON_H_ #define _I830_COMMON_H_ diff --git a/src/i830_cursor.c b/src/i830_cursor.c index e1cf0bf6..33b1bd9a 100644 --- a/src/i830_cursor.c +++ b/src/i830_cursor.c @@ -26,20 +26,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_cursor.c,v 1.6 2002/12/18 15:49:01 dawes Exp $ */ - -/* - * Reformatted with GNU indent (2.2.8), using the following options: - * - * -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78 - * -lp -npcs -psl -sob -ss -br -ce -sc -hnl - * - * This provides a good match with the original i810 code and preferred - * XFree86 formatting conventions. - * - * When editing this driver, please follow the existing formatting, and edit - * with <TAB> characters expanded at 8-column intervals. - */ /* * Authors: diff --git a/src/i830_dri.c b/src/i830_dri.c index 743521cd..0648249a 100644 --- a/src/i830_dri.c +++ b/src/i830_dri.c @@ -1,4 +1,3 @@ -/* $xfree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.c,v 1.15 2003/06/18 13:14:17 dawes Exp $ */ /************************************************************************** Copyright 2001 VA Linux Systems Inc., Fremont, California. @@ -28,36 +27,11 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ /* - * Reformatted with GNU indent (2.2.8), using the following options: - * - * -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78 - * -lp -npcs -psl -sob -ss -br -ce -sc -hnl - * - * This provides a good match with the original i810 code and preferred - * XFree86 formatting conventions. - * - * When editing this driver, please follow the existing formatting, and edit - * with <TAB> characters expanded at 8-column intervals. - */ - -/* * Authors: Jeff Hartmann <jhartmann@valinux.com> * David Dawes <dawes@xfree86.org> * Keith Whitwell <keith@tungstengraphics.com> */ -/* - * This driver does AGP memory allocation a little differently from most - * others. The 2D and 3D allocations have been unified (see i830_memory.c). - * The driver does the AGP allocations and binding directly, then passes - * on the mappings to the DRM module. The DRM's AGP interfaces are not used. - * The main difference with this is that the offsets need to include - * the AGP aperture base address because that won't be known or added on - * by the DRM module. - * - * DHD 07/2002 - */ - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/i830_dri.h b/src/i830_dri.h index 83ddd857..bedbcbe2 100644 --- a/src/i830_dri.h +++ b/src/i830_dri.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.h,v 1.6 2003/09/28 20:15:59 alanh Exp $ */ #ifndef _I830_DRI_H #define _I830_DRI_H diff --git a/src/i830_driver.c b/src/i830_driver.c index 7a81d933..1ff58668 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c,v 1.50 2004/02/20 00:06:00 alanh Exp $ */ /************************************************************************** Copyright 2001 VA Linux Systems Inc., Fremont, California. @@ -28,135 +27,12 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ /* - * Reformatted with GNU indent (2.2.8), using the following options: - * - * -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78 - * -lp -npcs -psl -sob -ss -br -ce -sc -hnl - * - * This provides a good match with the original i810 code and preferred - * XFree86 formatting conventions. - * - * When editing this driver, please follow the existing formatting, and edit - * with <TAB> characters expanded at 8-column intervals. - */ - -/* * Authors: Jeff Hartmann <jhartmann@valinux.com> * Abraham van der Merwe <abraham@2d3d.co.za> * David Dawes <dawes@xfree86.org> * Alan Hourihane <alanh@tungstengraphics.com> */ -/* - * Mode handling is based on the VESA driver written by: - * Paulo César Pereira de Andrade <pcpa@conectiva.com.br> - */ - -/* - * Changes: - * - * 23/08/2001 Abraham van der Merwe <abraham@2d3d.co.za> - * - Fixed display timing bug (mode information for some - * modes were not initialized correctly) - * - Added workarounds for GTT corruptions (I don't adjust - * the pitches for 1280x and 1600x modes so we don't - * need extra memory) - * - The code will now default to 60Hz if LFP is connected - * - Added different refresh rate setting code to work - * around 0x4f02 BIOS bug - * - BIOS workaround for some mode sets (I use legacy BIOS - * calls for setting those) - * - Removed 0x4f04, 0x01 (save state) BIOS call which causes - * LFP to malfunction (do some house keeping and restore - * modes ourselves instead - not perfect, but at least the - * LFP is working now) - * - Several other smaller bug fixes - * - * 06/09/2001 Abraham van der Merwe <abraham@2d3d.co.za> - * - Preliminary local memory support (works without agpgart) - * - DGA fixes (the code were still using i810 mode sets, etc.) - * - agpgart fixes - * - * 18/09/2001 - * - Proper local memory support (should work correctly now - * with/without agpgart module) - * - more agpgart fixes - * - got rid of incorrect GTT adjustments - * - * 09/10/2001 - * - Changed the DPRINTF() variadic macro to an ANSI C compatible - * version - * - * 10/10/2001 - * - Fixed DPRINTF_stub(). I forgot the __...__ macros in there - * instead of the function arguments :P - * - Added a workaround for the 1600x1200 bug (Text mode corrupts - * when you exit from any 1600x1200 mode and 1280x1024@85Hz. I - * suspect this is a BIOS bug (hence the 1280x1024@85Hz case)). - * For now I'm switching to 800x600@60Hz then to 80x25 text mode - * and then restoring the registers - very ugly indeed. - * - * 15/10/2001 - * - Improved 1600x1200 mode set workaround. The previous workaround - * was causing mode set problems later on. - * - * 18/10/2001 - * - Fixed a bug in I830BIOSLeaveVT() which caused a bug when you - * switched VT's - */ -/* - * 07/2002 David Dawes - * - Add Intel(R) 855GM/852GM support. - */ -/* - * 07/2002 David Dawes - * - Cleanup code formatting. - * - Improve VESA mode selection, and fix refresh rate selection. - * - Don't duplicate functions provided in 4.2 vbe modules. - * - Don't duplicate functions provided in the vgahw module. - * - Rewrite memory allocation. - * - Rewrite initialisation and save/restore state handling. - * - Decouple the i810 support from i830 and later. - * - Remove various unnecessary hacks and workarounds. - * - Fix an 845G problem with the ring buffer not in pre-allocated - * memory. - * - Fix screen blanking. - * - Clear the screen at startup so you don't see the previous session. - * - Fix some HW cursor glitches, and turn HW cursor off at VT switch - * and exit. - * - * 08/2002 Keith Whitwell - * - Fix DRI initialisation. - * - * - * 08/2002 Alan Hourihane and David Dawes - * - Add XVideo support. - * - * - * 10/2002 David Dawes - * - Add Intel(R) 865G support. - * - * - * 01/2004 Alan Hourihane - * - Add Intel(R) 915G support. - * - Add Dual Head and Clone capabilities. - * - Add lid status checking - * - Fix Xvideo with high-res LFP's - * - Add ARGB HW cursor support - * - * 05/2005 Alan Hourihane - * - Add Intel(R) 945G support. - * - * 09/2005 Alan Hourihane - * - Add Intel(R) 945GM support. - * - * 10/2005 Alan Hourihane, Keith Whitwell, Brian Paul - * - Added Rotation support - * - * 12/2005 Alan Hourihane, Keith Whitwell - * - Add Intel(R) 965G support. - */ - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/i830_memory.c b/src/i830_memory.c index 52ec872b..d5827f81 100644 --- a/src/i830_memory.c +++ b/src/i830_memory.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_memory.c,v 1.9 2003/09/24 03:16:54 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. @@ -29,19 +28,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ /* - * Reformatted with GNU indent (2.2.8), using the following options: - * - * -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78 - * -lp -npcs -psl -sob -ss -br -ce -sc -hnl - * - * This provides a good match with the original i810 code and preferred - * XFree86 formatting conventions. - * - * When editing this driver, please follow the existing formatting, and edit - * with <TAB> characters expanded at 8-column intervals. - */ - -/* * Authors: * Keith Whitwell <keith@tungstengraphics.com> * David Dawes <dawes@xfree86.org> diff --git a/src/i830_video.c b/src/i830_video.c index 8d33d692..1e05e9c0 100644 --- a/src/i830_video.c +++ b/src/i830_video.c @@ -23,7 +23,6 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_video.c,v 1.11tsi Exp $ */ /* * i830_video.c: i830/i845 Xv driver. diff --git a/src/xvmc/I810XvMC.c b/src/xvmc/I810XvMC.c index 10606de4..0754ff44 100644 --- a/src/xvmc/I810XvMC.c +++ b/src/xvmc/I810XvMC.c @@ -33,7 +33,6 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE. ** ** ***************************************************************************/ -/* $XFree86: xc/lib/XvMC/hw/i810/I810XvMC.c,v 1.10 2002/10/30 12:52:01 alanh Exp $ */ #include <stdio.h> #include <stdlib.h> #include <unistd.h> diff --git a/src/xvmc/I810XvMC.h b/src/xvmc/I810XvMC.h index dc2cab88..c875eca2 100644 --- a/src/xvmc/I810XvMC.h +++ b/src/xvmc/I810XvMC.h @@ -32,7 +32,6 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE. * * ***************************************************************************/ -/* $XFree86: xc/lib/XvMC/hw/i810/I810XvMC.h,v 1.3 2002/10/30 12:52:02 alanh Exp $ */ #ifndef I810XVMC_H diff --git a/src/xvmc/xf86dri.c b/src/xvmc/xf86dri.c index 96987bfa..9ea919af 100644 --- a/src/xvmc/xf86dri.c +++ b/src/xvmc/xf86dri.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/lib/GL/dri/XF86dri.c,v 1.13 2002/10/30 12:51:25 alanh Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/src/xvmc/xf86dri.h b/src/xvmc/xf86dri.h index 81cfdfdd..5b8655de 100644 --- a/src/xvmc/xf86dri.h +++ b/src/xvmc/xf86dri.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/lib/GL/dri/xf86dri.h,v 1.8 2002/10/30 12:51:25 alanh Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/src/xvmc/xf86dristr.h b/src/xvmc/xf86dristr.h index 3b43438e..d8989963 100644 --- a/src/xvmc/xf86dristr.h +++ b/src/xvmc/xf86dristr.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/lib/GL/dri/xf86dristr.h,v 1.10 2002/10/30 12:51:25 alanh Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. |