xserver-xorg-video-savage: Changes to 'debian-unstable'
.cvsignore | 19
ChangeLog | 1003 ++++++++++++-
Makefile.in | 4
aclocal.m4 | 306 +++-
autogen.sh | 12
config.guess | 21
config.h.in | 9
config.sub | 58
configure | 1524 +++++---------------
debian/changelog | 24
debian/control | 14
debian/patches/02_fix_respawn_crash_regression.diff | 23
debian/patches/series | 1
debian/rules | 4
debian/xsfbs/xsfbs.mk | 28
man/.cvsignore | 2
man/Makefile.in | 6
mkinstalldirs | 89 -
src/.cvsignore | 6
src/Makefile.in | 6
src/savage_bci.h | 6
src/savage_driver.c | 6
src/savage_driver.h | 1284 ++++++++--------
src/savage_exa.c | 142 +
src/savage_video.c | 32
25 files changed, 2537 insertions(+), 2092 deletions(-)
New commits:
commit 8322053b349091d2762b8abeaa1b48344b2de026
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Sat Apr 28 16:41:48 2007 +0200
Drop 02_fix_respawn_crash_regression.diff
diff --git a/debian/changelog b/debian/changelog
index 52001f8..446e4dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ xserver-xorg-video-savage (1:2.1.2-5) UNRELEASED; urgency=low
* Replaces/Conflicts: xserver-xorg-driver-savage.
[ Brice Goglin ]
+ * Pull fixes from upstream up-to ff0ee0420bd7c0c1be5bf97e8764f3e974ff5887
+ + Drop 02_fix_respawn_crash_regression.diff, applied upstream
* Don't build-dep on libdrm-dev on hurd-i386.
* Install the upstream changelog.
* Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902
@@ -12,9 +14,8 @@ xserver-xorg-video-savage (1:2.1.2-5) UNRELEASED; urgency=low
* Add a link to www.X.org and a reference to the xf86-video-savage
module in the long description.
* Remove Fabio from uploaders with his permission. He's always welcome back.
- * Pull fixes from upstream up-to ff0ee0420bd7c0c1be5bf97e8764f3e974ff5887
- -- Brice Goglin <Brice.Goglin@ens-lyon.org> Sat, 28 Apr 2007 16:28:53 +0200
+ -- Brice Goglin <Brice.Goglin@ens-lyon.org> Sat, 28 Apr 2007 16:36:03 +0200
xserver-xorg-video-savage (1:2.1.2-4) experimental; urgency=low
diff --git a/debian/patches/02_fix_respawn_crash_regression.diff b/debian/patches/02_fix_respawn_crash_regression.diff
deleted file mode 100644
index 7144f8f..0000000
--- a/debian/patches/02_fix_respawn_crash_regression.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-This patch by Mikko Rapeli <mikko.rapeli@iki.fi>.
-
-The savage driver some time ago started crashing when respawned from
-kdm et al. When MapMMIO and MapFB functions were merged to MapMem, one
-MapFB call in SavageScreenInit was not replaced with MapMem.
-
-See Debian bugs #397084 and #398860.
-Committed upstream as 3e2d370e291f5f222de88075f1f285446cca0569.
-
-Index: xserver-xorg-video-savage/src/savage_driver.c
-===================================================================
---- xserver-xorg-video-savage.orig/src/savage_driver.c 2006-12-24 18:47:22.000000000 +0100
-+++ xserver-xorg-video-savage/src/savage_driver.c 2006-12-24 18:50:34.000000000 +0100
-@@ -3096,6 +3096,9 @@
-
- SavageEnableMMIO(pScrn);
-
-+ if (!SavageMapMem(pScrn))
-+ return FALSE;
-+
- psav->FBStart2nd = 0;
-
- if (psav->overlayDepth) {
diff --git a/debian/patches/series b/debian/patches/series
index 15a2be4..aca27e7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
01_savage_driver_disable_randr_on_rotation.diff
-02_fix_respawn_crash_regression.diff
commit 90347b424b9b8b6d15babd11bb80c482eba8b1f3
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Sat Apr 28 16:31:00 2007 +0200
Update upstream ChangeLog
diff --git a/ChangeLog b/ChangeLog
index 0d5c037..edc068a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,116 +1,945 @@
-2006-05-09 Alex Deucher <agd5f@yahoo.com>
+commit ff0ee0420bd7c0c1be5bf97e8764f3e974ff5887
+Author: Alex Deucher <alex@botch2.com>
+Date: Mon Apr 2 17:32:02 2007 -0400
- * man/savage.man:
- * src/savage_exa.c: (SavageEXAInit), (SavageDownloadFromScreen):
- - add AccelMethod to savage.man
- - fix bug 6847
- - add memcpy based DFS
+ final odds and ends for exa
+
+ I still get blue for solids that should be grey for certain things
+ (firefox status and navigation bars, certain mouse overs, etc.)
-2006-04-30 Alex Deucher <agd5f@yahoo.com>
+commit 675ff8177852732c6e9d52464f34d5fe867ac67e
+Author: Alex Deucher <alex@botch2.com>
+Date: Wed Mar 21 02:14:16 2007 -0400
- * src/Makefile.am:
- * src/savage_accel.c: (SavageSetGBD_M7), (SavageSetGBD_PM),
- (SavageSetGBD_2000), (SavageInitAccel):
- * src/savage_bci.h:
- * src/savage_driver.c: (SavageSetup), (SavagePreInit):
- * src/savage_driver.h:
- * src/savage_exa.c: (SavageGetCopyROP), (SavageGetCopyROP_PM),
- (SavageEXAInit), (SavageEXASync), (SavageSetBD),
- (SavagePrepareSolid), (SavageSolid), (SavageDoneSolid),
- (SavagePrepareCopy), (SavageCopy), (SavageDoneCopy),
- (SavageUploadToScreen), (SavageDownloadFromScreen):
- * src/savage_image.c:
- * src/savage_video.c: (SavageStopVideo), (SavageVideoSave),
- (SavageAllocateMemory), (SavageFreeMemory), (SavagePutImage),
- (SavageAllocateSurface), (SavageFreeSurface):
- * src/savage_xaa.c: (SavageRestoreAccelState), (SavageXAAInit),
- (SavageAccelSync), (SavageHelpPatternROP), (SavageHelpSolidROP),
- (SavageSetupForScreenToScreenCopy),
- (SavageSubsequentScreenToScreenCopy), (SavageSetupForSolidFill),
- (SavageSubsequentSolidFillRect),
- (SavageSetupForCPUToScreenColorExpandFill),
- (SavageSubsequentScanlineCPUToScreenColorExpandFill),
- (SavageSubsequentColorExpandScanline),
- (SavageSetupForMono8x8PatternFill),
- (SavageSubsequentMono8x8PatternFillRect),
- (SavageSetupForColor8x8PatternFill),
- (SavageSubsequentColor8x8PatternFillRect),
- (SavageSubsequentSolidBresenhamLine), (SavageSetClippingRectangle),
- (SavageDisableClipping), (SavageWriteBitmapCPUToScreenColorExpand),
- (SavageSetupForImageWrite), (SavageSubsequentImageWriteRect):
- - Add EXA support (Solid, Copy, UTS)
+ Get Solid() working again
+
+ You have to send color EVERY time.
-2006-04-07 Adam Jackson <ajax@freedesktop.org>
+commit ee7c53ae2b6e167dd4d6e813bc565e991f6b73e3
+Author: Alex Deucher <alex@botch2.com>
+Date: Tue Mar 6 02:28:33 2007 -0500
- * configure.ac:
- * src/savage_driver.h:
- Bump to 2.1.1 for Xv changes.
+ small exa fix ups, remove an errant comment
-2006-04-07 Aaron Plattner <aplattner@nvidia.com>
+commit 3e2d370e291f5f222de88075f1f285446cca0569
+Author: Mikko Rapeli <mikko.rapeli@iki.fi>
+Date: Wed Jan 3 21:50:22 2007 -0500
- * src/savage_video.c: (SavagePutImage):
- Add a DrawablePtr argument to the XV functions to pave the way for
- redirected video.
+ fix savage respawn crash
+
+ SavageCloseScreen() unmaps memory, but SavageScreenInit()
+ never maps it again.
-2006-04-07 Adam Jackson <ajax@freedesktop.org>
+commit 37240b81daa4ed46c27e439d22b6fd9909dac249
+Author: Alex Deucher <alex@t41p.(none)>
+Date: Wed Nov 22 11:56:41 2006 -0500
- * configure.ac:
- * src/savage_dri.c:
- * src/savage_driver.h:
- * src/savage_hwmc.c:
- * src/savage_i2c.c:
- Unlibcwrap. Bump server version requirement. Bump to 2.1.0.
+ clean up some leftover cruft.
-2006-02-08 Luc Verhaegen <libv@skynet.be>
+commit 4f8660473ba079f98f097abd72ce2647c345d7cd
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Oct 23 10:57:35 2006 -0700
- * src/savage_dri.c: (SAVAGEDRIScreenInit):
- * src/savage_driver.c: (SavagePreInit):
- * src/savage_driver.h:
-
- - Remove insane usage of pScrn->clocks. Set maxClock directly.
- - Fix trivial and harmless warning in DRI code (FrameBufferBase)
+ Strip ^M's out of savage_driver.h
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit e361a9523394a2f0558f7d2648bf6a43ebe31f2e
+Author: Alex Deucher <alex@samba.(none)>
+Date: Thu Sep 28 22:02:29 2006 -0400
- * configure.ac:
- Update package version for X11R7 release.
+ bump to 2.1.2 for new release
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit a94abe5a59cf526ce0699d8356d239e1984d0907
+Author: Alex Deucher <alex@samba.(none)>
+Date: Tue Sep 19 00:09:01 2006 -0400
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ minor exa updates
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit baa74b10d7a1c304dba2d658e4d1336b7ee7e70e
+Author: Alex Deucher <alex@samba.(none)>
+Date: Mon Sep 18 22:30:13 2006 -0400
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ fix DRI locking in savage driver. Based on ajax's similar patch.
+ Thanks to ajax and tilman for locking advice and Pascal Sclafer
+ for tracking this down. Fixes bug 6357.
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit bb1eac0b6b0d2ab02bd7b47f3c2e4b3f40e7486f
+Author: Alex Deucher <alex@samba.(none)>
+Date: Sun Sep 17 17:30:08 2006 -0400
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ re-order SavageMapMem() so that ram detection works again.
-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 5108d1dd581a6e649f89812affba8481491e1bd7
+Author: Ian Romanick <idr@umwelt.(none)>
+Date: Tue Aug 8 12:21:11 2006 -0700
- * configure.ac:
- Remove extraneous AC_MSG_RESULT.
+ Instead of passing SavagePciChipsets in the p_chip parameter of
+ xf86ConfigPciEntity, pass RES_SHARED_VGA in the res parameter.
-2005-11-20 Adam Jackson <ajax@freedesktop.org>
+commit 6ac341e9fd4157a0cdb7fd3d043c136d5799146f
+Author: Ian Romanick <idr@umwelt.(none)>
+Date: Tue Aug 8 10:28:33 2006 -0700
- * configure.ac:
- Bump libdrm dep to 2.0.
+ Add some more missing license statements. Trivial whitespace clean-ups.
-2005-11-29 Adam Jackson <ajax@freedesktop.org>
+commit ee91d006596634d339a853aaaa09b33b74b60235
+Author: Ian Romanick <idr@umwelt.(none)>
+Date: Mon Aug 7 17:13:40 2006 -0700
- * configure.ac:
- Only build dlloader modules by default.
+ DRIINFO_MAJOR_VERSION has be 5 for over a year. Remove the old code.
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit e4609dcc51f6034393a0b75fa52caa9b3e585d3b
+Author: Ian Romanick <idr@umwelt.(none)>
+Date: Mon Aug 7 17:13:08 2006 -0700
- * configure.ac:
- Update package version number for X11R7 RC2 release.
+ Do a single mapping per BAR. This cleans up the code a bit and paves
+ the way for the pci-rework branch. The disadvantage is that the
+ Savage3D puts MMIO and framebuffer in the same BAR. This has to be
+ fixed-up after the mapping by altering the write-combine setting for
+ the framebuffer subrange.
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 928b82660929eb7dfe42482880abc0203b3860e8
+Author: Ian Romanick <idr@umwelt.(none)>
+Date: Mon Aug 7 16:58:06 2006 -0700
- * configure.ac:
- Update pkgcheck dependencies to work with separate build roots.
+ Remove duplicate register defines.
+
+commit 31939c4c516124bfca0de7db4278b6b16df5e70f
+Author: Ian Romanick <idr@umwelt.(none)>
+Date: Mon Aug 7 13:27:48 2006 -0700
+
+ Introduce the savage_region structure, which is used to track mappable
+ regions of PCI space.
+
+commit 3a7f84ac41e93a9395891913cec1c5acb30937d0
+Author: Ian Romanick <idr@umwelt.(none)>
+Date: Fri Aug 4 16:30:25 2006 -0700
+
+ Make a couple local, static arrays const. The RamSavage4 array is not
+ const because it can be modified for some quirky cards. Neat!
+
+commit 2f8352df6488476b0c1a46798eca5dd38827444b
+Author: Ian Romanick <idr@umwelt.(none)>
+Date: Fri Aug 4 15:57:08 2006 -0700
+
+ Merge SavageMapMMIO and SavageMapFB into a single, new function called
+ SavageMapMem. Eliminate the MapBaseDense cruft.
+
+commit 6f9abbb972834561cd8494a1d4fb47402b285d7d
+Author: Ian Romanick <idr@umwelt.(none)>
+Date: Fri Aug 4 15:10:40 2006 -0700
+
+ Fix line endings (at least, I assume that's why git-diff thinks every
+ line in the file is chaged). Add missing license statement. Change
+ SAVAGE_VGAHWMMIO_H to SAVAGE_DRIVER_H.
+
+commit 3e2980251570a304057579e97ec26bc3fd19f8d7
+Author: Ian Romanick <idr@umwelt.(none)>
+Date: Fri Aug 4 14:56:06 2006 -0700
+
+ Pass the HaveDriverFuncs flag to xf86AddDriver. Make sure the
+ DriverFuncs pointer is NULL. Delete a duplicate #define.
+
+commit 876f90e0fe06cedde15eb30e881824f126352bd9
+Author: <alex@samba.(none)>
+Date: Thu Jul 20 22:50:43 2006 -0400
+
+ Make sure CLUTs are enabled
+
+commit 3814db881be50faf0daf83b45ef23baeeef5b021
+Author: <alex@samba.(none)>
+Date: Thu Jul 20 22:25:05 2006 -0400
+
+ no accel at depth 24 in dualhead mode in MX/IX chips (hardware limitation)
+
+commit ec4fde5b4b6af410fcbf97062db77cc61eb332aa
+Author: <alex@samba.(none)>
+Date: Tue Jul 18 00:11:32 2006 -0400
+
+ make sure to map full FB in dualhead mode. fixes some issues with dualhead.
+ other dualhead drivers may need this.
+
+commit 03bb33088d5c905d1c2cf764ba3894405670b9f4
+Author: Alex Deucher <agd5f@yahoo.com>
+Date: Wed May 10 02:58:56 2006 +0000
+
+ - add AccelMethod to savage.man
+ - fix bug 6847
+ - add memcpy based DFS
+
+commit 6d688c993ec7baf8f00df59764dd3e04bab24e09
+Author: Alex Deucher <agd5f@yahoo.com>
+Date: Sun Apr 30 17:51:15 2006 +0000
+
+ - Add exa support (solid, copy, UTS)
+
+commit ef46fb29088e7cc50c6072d66c6ac1fe5cd398bd
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sat Apr 8 01:42:34 2006 +0000
+
+ Bump to 2.1.1 for Xv changes.
+
+commit efb23e12f1bcae10a324dadc802322238091b48c
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Fri Apr 7 23:13:19 2006 +0000
+
+ Add a DrawablePtr argument to the XV functions to pave the way for
+ redirected video.
+
+commit e423d8649334a62c4657f7633a09f7976be50e34
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Apr 7 20:55:14 2006 +0000
+
+ Unlibcwrap. Bump server version requirement. Bump to 2.1.0.
+
+commit bb4fede8dc7741d00014fdb353945b0832599333
+Author: Luc Verhaegen <libv@skynet.be>
+Date: Wed Feb 8 14:39:34 2006 +0000
+
+ Some trivial savage fixes:
+ - Remove insane usage of pScrn->clocks. Set maxClock directly.
+ - Fix trivial and harmless warning in DRI code (FrameBufferBase)
+
+commit 90fb73bc67a87f3b202ba45b326e70759b49e7b1
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Dec 21 02:30:02 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit d35a9f882737c904f2b37a9a65cd41c4b1f65396
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Dec 19 16:25:54 2005 +0000
+
+ Stub COPYING files
+
+commit 21140974d9c8719dc12327d051b14aab593a0b11
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Dec 15 00:24:18 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 37df4e4fd446c140831ea46c1eef67f9a6d97211
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Dec 6 22:48:37 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit 07f8fc2f431c0db0069dbf79d917aa52317724ac
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Dec 3 05:49:35 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit e927404157b8a65bbbe613bff5d0e03b3b4e078e
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Dec 2 02:16:10 2005 +0000
+
+ Remove extraneous AC_MSG_RESULT.
+
+commit a99fdf7b614cf167a6e07a05f65c214cf2bd2305
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Wed Nov 30 18:51:40 2005 +0000
+
+ Bump libdrm dep to 2.0.
+
+commit eb0931851b84c60c4e59e16fe09779f6470fe7e3
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Tue Nov 29 23:30:02 2005 +0000
+
+ Only build dlloader modules by default.
+
+commit 892ee75d88020868a6a244bb4b646d20901e5c39
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Nov 28 22:04:10 2005 +0000
+
+ Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
+ update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
+
+commit 2eaf6d5609aec58d7101069afb612821fd1aac73
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Mon Nov 21 10:49:17 2005 +0000
+
+ Add .cvsignores for drivers.
+
+commit 555d930e6f20e3ac4bb5be47470adad7f04483ad
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Nov 9 21:31:21 2005 +0000
+
+ Bump version numbers for X11R6.9/X11R7 RC2.
+
+commit 490cb4b34cfb9e344627db8b05de7876586bf1c2
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Nov 9 21:15:20 2005 +0000
+
+ Update package version number for X11R7 RC2 release.
+
+commit 292f552589bbd6e8a98def8eafe4e5c8765e1a34
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Nov 9 07:30:04 2005 +0000
+
+ Fix DoLoadableServer NO build.
+
+commit 160edb73b384ef6215a7ae6fc9ecc1431450c1f7
+Author: Kean Johnson <kean@armory.com>
+Date: Tue Nov 8 06:33:28 2005 +0000
+
+ See ChangeLog entry 2005-11-07 for details.
+
+commit 9f00f678a75fd10865d79cb7b1cc25cae3ffebab
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Nov 1 15:08:54 2005 +0000
+
+ Update pkgcheck depedencies to work with separate build roots.
+
+commit 4b9d1379ad773585e45bbc0971c878e7774fa34d
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Oct 21 18:40:19 2005 +0000
+
+ Bug #4829: Remove some useless DRI symbol checks.
+
+commit 58761bd4d8110694a74875a0c92bf9e7dab62a5a
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 19 02:48:04 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 444f8c26875c210808d59cd9d9afebdbb47158ba
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 19 02:46:56 2005 +0000
+
+ lib/Xcomposite/Xcomposite.h
+ lib/Xft/Imakefile
+ lib/Xft/Xft.h Update library version numbers to match updated package
+ versions.
+ Update driver version numbers for RC1.
+
+commit 903505b2c8a8e49962bd9b256ebc3a670360f258
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Tue Oct 18 00:01:54 2005 +0000
+
+ Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro
+ substitutions to work better with BSD make
+
+commit e5a0460273ba7a99abf811b603bd273bd02917b5
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Oct 17 22:57:35 2005 +0000
+
+ More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead
+ of indirectly
+
+commit aed94c462d655ca424a2c884bc0ddcdeac222835
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Oct 17 00:09:05 2005 +0000
+
+ Use sed & cpp to substitute variables in driver man pages
+
+commit 660f0920a7633f55dd803d7c4f749df7bcb1fbc2
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sat Sep 24 18:45:45 2005 +0000
+
+ Disable the {Open,Close}FullScreen DRI protocol. Remove empty FullScreen
+ stubs from drivers, comment the non-empty ones.
+
+commit 81b6385f0fa410bc18e735e37e8db62ef29a0d82
+Author: Alex Deucher <agd5f@yahoo.com>
+Date: Sat Aug 27 16:45:56 2005 +0000
+
+ - re-add RestoreAccelState() to make XAA happy for dualhead
+
+commit 2f0a836a7bc6de48e37fdf7014e6b1b8f78851bf
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Mon Aug 22 03:44:04 2005 +0000
+
+ Fix test for DRI headers, bump to 2.0.1.
+
+commit 04ae3ba94c6e58afbb6c830e191fe9fe658f2cb4
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Thu Aug 18 09:03:48 2005 +0000
+
+ Update autogen.sh to one that does objdir != srcdir.
+
+commit 7441aa42e26df500f9355f7f1f33af9c955c30f8
+Author: Alex Deucher <agd5f@yahoo.com>
+Date: Sat Aug 6 06:51:29 2005 +0000
+
+ Somehow I missed Bresenham lines when I fixed accel on crtc2. Make sure to
+ send the new offset there as well.
+
+commit 6620d141ebdb9dda3b0eb72462893ade0a4d6389
+Author: Ian Romanick <idr@us.ibm.com>
+Date: Fri Aug 5 23:04:33 2005 +0000
+
+ I have resolved this by making all the "Direct rendering disabled" messages
+ X_WARNING and all the "Direct rendering enabled" messages X_INFO.
+ Ideally, we need to factor some of this stuff out to common code. There
+ is a *LOT* of duplication among the *_dri.c files under
+ programs/Xserver/hw/xfree86/drivers.
+ I'm trying to clean up as much low hanging fruit as I can and got tired of
+ waiting for ajax. :P
+
+commit 6da51e9c6f589ffa78ed6a5da0548eb56ab90b7c
+Author: Alex Deucher <agd5f@yahoo.com>
+Date: Thu Aug 4 02:42:10 2005 +0000
+
+ - fix accel problems on crtc2. It seems the GBD doesn't always update
+ correctly resulting in incorrect stride and/or offset. Switch the accel
+ code to use the PBD instead and send the new offset with each command.
+ Because the offset is always up to date, we no longer need
+ SavageRestoreAccelState().
+
+commit 16d2e7832a8b138e78947896c69537a59124dfec
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Jul 29 21:22:44 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit 593267735819585c87652a62d62ca231a9e8f01b
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Wed Jul 27 21:23:29 2005 +0000
+
+ Add xf86driproto to dependencies for drivers with DRI support. Patch from
+ Donnie Berkholz
+
+commit cacbac692c3725e372e9c25177f4b26d86a8c0d5
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Tue Jul 26 22:11:46 2005 +0000
+
+ Build system for savage
+
+commit c1c5f421dbce58f58b430497a89c73100e17beb8
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Jul 11 02:29:59 2005 +0000
+
+ Prep for modular builds by adding guarded #include "config.h" everywhere.
+
+commit c332dffd52d787025614173ddfedfca62f1ccd63
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sat Jun 25 21:16:56 2005 +0000
+
+ Bug #3626: _X_EXPORT tags for video and input drivers.
+
+commit eb107dead1844bfe1b2ca5510c50efd13fe883ef
+Author: Alex Deucher <agd5f@yahoo.com>
+Date: Thu May 19 05:32:16 2005 +0000
+
+ Disable ScreenToScreenCopy on crtc2 at depth 24. Fixes screen corruption.
+
+commit 3d8be0cf1ccbbe4e68c5fae92203a152901b2436
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Wed May 18 17:47:36 2005 +0000
+
+ Bug #3163: Create new DRIINFO_*_VERSION macros to indicate the version
+ number of the DRIInfoRec, disambiguating it from the XF86DRI protocol
+ version number. Modify DRIQueryVersion to return the libdri version
+ number, which all DDXes were requesting implicitly. Fix the DDXes to
+ check for the DRIINFO version they were compiled against.
+
+commit a42d68da8d3905bc21d426b68519ba0d8356ed7b
+Author: Egbert Eich <eich@suse.de>
+Date: Tue May 17 08:30:00 2005 +0000
+
+ Set the hardware to 8bit CLUT mode in 8 bpp. We used to flag an
+ 8 bit DAC to DDX but did not make sure it actually was running in 8 bit
+ mode. On Savage4 the HW cursor doesn't seem to be truecolor in 8bpp
+ - not even with the streams engine running. Fix SavageProbeDDC() to load
+ vbe module and initialize it before using it (Bugzilla #3309).
+
+commit be455c98276cec6cc881ca0093476e244c765bf8
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Wed Apr 20 12:25:29 2005 +0000
+
+ Fix includes right throughout the Xserver tree:
+ change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
+ change "foo.h", "extensions/foo.h" and "X11/foo.h" to
+ <X11/extensions/foo.h> for extension headers, e.g. Xv.h;
+ change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
+
+commit 4629f974734368bc354bbccaec80b72ec10a66a2
+Author: Felix Kuehling <fxkuehl@gmx.de>
+Date: Thu Apr 14 14:47:21 2005 +0000
+
+ User reports indicate that both command and vertex DMA on SuperSavages lock
+ up the engine. Disabling DMA on SuperSavages until someone figures out
+ how to make it work.
+
+commit e6fc11c3fbf2b80c29f1c73a1b2175edfb7a63ef
+Author: Egbert Eich <eich@suse.de>
+Date: Mon Apr 4 10:48:43 2005 +0000
+
+ Add ROP_NEEDS_SOURCE to Mono8x8PatternFill as S3 chips tend to lock up
+ without it (Helmut Fahrion).
+
+commit b6bdfa27c9c84628d1f489a15d09214e920e7d86
+Author: Felix Kuehling <fxkuehl@gmx.de>
+Date: Thu Mar 17 15:34:44 2005 +0000
+
+ Invalidate 3D hardware state in SavageEnterVT. This fixes 3D applications
+ running during a suspend-resume cycle.
+
+commit d2b0d82024da031257e943c424bd5f63cd0474e3
+Author: Felix Kuehling <fxkuehl@gmx.de>
+Date: Thu Mar 17 00:04:19 2005 +0000
+
+ Fixed PCI ShadowStatus initialization for the case that ShadowStatus is
+ explicitly enabled in the configuration file.
+
+commit 8bbfca79a7397e997b875ea8943c1120114904e0
+Author: Alex Deucher <agd5f@yahoo.com>
+Date: Wed Mar 16 01:00:38 2005 +0000
+
+ - small fixups for old streams
+ - more work on Xv support for savage2000 (still not working 100%)
+
+commit 689e9535e014b658d0aef2ebf554090226597a4d
+Author: Felix Kuehling <fxkuehl@gmx.de>
+Date: Sun Mar 13 15:24:26 2005 +0000
+
+ Fixed fallback to PCI mode when AGP initialization fails.
+
+commit 9e84104d6b0ab8fd49edfa3568511fcd41983dc4
+Author: Felix Kuehling <fxkuehl@gmx.de>
+Date: Sun Mar 13 00:14:02 2005 +0000
+
+ - Removed lots of dead code.
+ - Moved driver-private definitions from savage_dri.h to savage_driver.h.
+ savage_dri.h should only contain the public interface between DDX and
+ DRI drivers.
+ - Don't forget to remove the command DMA mapping in SAVAGEDRICloseScreen.
+
+commit 33033884e9ec07d96c70765132a2be0ebc466299
+Author: Felix Kuehling <fxkuehl@gmx.de>
+Date: Sun Mar 6 01:36:10 2005 +0000
+
+ - Support for the new DRM version 2.4 with command DMA.
+ - Added an option "DmaMode" to choose between vertex and command DMA.
+ - Allow ShadowStatus to be explicitly disabled even with DRI enabled.
+ - Updated the man page.
+
+commit 21bf49050a7b868c50831fb3951086fe9c21e8f6
+Author: Felix Kuehling <fxkuehl@gmx.de>
+Date: Sat Feb 26 13:56:27 2005 +0000
+
+ Fixed ShadowStatus handling with DRI:
+ - always enable ShadowStatus when DRI is enabled
+ - if DRI initialization fails, reset ShadowStatus to configured setting
+ - if DRI initialization fails, fall back to ShadowStatus in framebuffer
+
+commit e1f269bfd24195e96bf6194911430ffc7de4431f
+Author: Felix Kuehling <fxkuehl@gmx.de>
+Date: Sat Feb 5 23:57:17 2005 +0000
+
+ Don't clear the front buffer in SAVAGEDRIInitBuffers. Fixes blackness of
+ GL-XScreensaver hacks that grab the screen.
+
+commit 9ae75471d246302a79994bdc71ae7e6a3915b609
+Author: Felix Kuehling <fxkuehl@gmx.de>
+Date: Fri Feb 4 01:14:49 2005 +0000
+
+ Applied patch (id=1354) by Mike A. Harris from bug #1901: The attached
+ patch updates a couple of PCI IDs for the Savage driver --
+ Debian/Ubuntu/Red Hat/Fedora.
+
+commit 367d124c4b49ac134a9f2bf8acb6711957ef21c6
+Author: Alex Deucher <agd5f@yahoo.com>
+Date: Wed Feb 2 04:58:27 2005 +0000
+
+ - fix long standing bug in depth 24 that made colors look dithered. The
+ CLUT was not being switched to 8 bit mode.
+
+commit dbd65625f1eb3dbb5c45e1fc41e385db45c973ed
+Author: Felix Kuehling <fxkuehl@gmx.de>
+Date: Tue Feb 1 23:20:22 2005 +0000
+
+ - Changed option ForcePCIMode to option BusType for consistency with other
+ drivers (radeon) and the DmaType option.
+ - Changed the type of a few more messages in SavagePreInit.
+ - Updated the manual page.
+ - Moved option CrtOnly to a more sensible place in the man page.
+
+commit 0c5a94f8a342728e43792e01c6df5ff17dbb59c8
+Author: Felix Kuehling <fxkuehl@gmx.de>
+Date: Mon Jan 31 01:41:36 2005 +0000
+
+ Update the savage manual page:
+ - Added options AGPSize, DmaType and ForcePCIMode.
+ - Updated DisableCOB: 3D requires COB, default value is "off", which means
+ that the COB is enabled.
+
+commit 37e6666824a771271f60ad12174a29b2ac6b826b
+Author: Felix Kuehling <fxkuehl@gmx.de>
+Date: Mon Jan 31 01:09:27 2005 +0000
+
+ - Shadow status update thresholds on Savage4 were reversed. Fixed now.
+ - Fixed cobIndex on Savage2K. It used only a 4K COB so far. Now we have
+ full 128K.
+ - Program the shadow status thresholds correctly on Savage2K.
+ - Savage2K reports used entries in the queue in qword units instead of
+ dwords. Fixed WaitQueue2K accordingly.
+ - Event counter 0 is in status word 2 instead of status word 1 on Savage2K.
+ Fixed ShadowWait accordingly.
+ - Added a ShadowWaitQueue function that doesn't idle the engine all the
+ time. This improves 3D animation smoothness with concurrent
+ 2D activity when shadow status is enabled.
+
+commit 7712602bccc71210ad4319aaf2bc8e1b15b6a01a
+Author: Alex Deucher <agd5f@yahoo.com>
+Date: Sun Jan 30 22:26:26 2005 +0000
+
+ - update comment about tiled surface regs for savage3d
+
+commit 565d77fe6e5d5357a04ac5612a1d25aa1194cad9
+Author: Felix Kuehling <fxkuehl@gmx.de>
+Date: Sun Jan 30 22:17:15 2005 +0000
+
+ Added two new options "DmaType" and "ForcePCIMode".
+
+commit cb406770d1b88ecda3e7dba14f21b2cf90449a93
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Thu Jan 27 03:50:46 2005 +0000
+
+ - Fix tiled framebuffer setup on Savage3D (Alex Deucher)
+ - Disable building the Savage DRI driver.
+
+commit d62d010ca8590d99d4150f7b00999e619a6aaac3
+Author: Felix Kuehling <fxkuehl@gmx.de>
+Date: Mon Jan 10 23:11:53 2005 +0000
+
+ - Support for PCI Savages: on PCI cards don't run SAVAGEDRIAgpInit, add PCI
+ DMA buffers instead of AGP buffers. Set dma_type properly in
+ SAVAGEDRIKernelInit.
+ - Something's still wrong with ShadowStatus on the PCI card I'm testing
+ here. Probably a DRM issue.
+ - Fixed error handling. Call SAVAGEDRICloseScreen instead of
+ DRICloseScreen.
+ - Added AGP/PCI detection (copied from the radeon driver).
+
+commit 303bc2a7df00aadc13d747d6c240ca3d693cad4e
+Author: Felix Kuehling <fxkuehl@gmx.de>
+Date: Sun Jan 2 11:24:48 2005 +0000
+
+ Make 32-bit visuals match the set of visuals supported by the DRI driver.
+
+commit 0de5e0b27ec95952d65d3bc2611253af702e3f9f
+Author: Felix Kuehling <fxkuehl@gmx.de>
+Date: Sat Jan 1 23:42:09 2005 +0000
+
+ Reenabled SAVAGEDRIInitBuffers and SAVAGEDRIMoveBuffers and fixed lockups
+ they were causing. InitBuffers now uses the DRM clear command,
+ MoveBuffers needs to wait for 3D idle. Some related cleanups.
+
+commit 8fad99f52106c64bf7f5c88b2246313338286f54
+Author: Felix Kuehling <fxkuehl@gmx.de>
+Date: Sat Jan 1 20:32:23 2005 +0000
+
+ Updates to support the new Savage DRM driver (version 2.0.x) which was just
+ committed to DRM CVS. Cleaned up the interface to the DRI driver.
+ Bumped the Savage DDX version to 2.0.0 due to incompatible changes in
+ that interface.
+
+commit d0e9c3ad1cb9babbe841926c9a373ebe40dfe62c
+Author: Alex Deucher <agd5f@yahoo.com>
+Date: Sun Dec 12 00:14:32 2004 +0000
+
+ - only mess with Dynamicclocks on mobility chips (Benh, me) bug 1912
+ - fix display detection (Hui Yu) bug 1559
+ - Add new option "BIOSHotkeys" to allow the bios to control output
+ switching (off by default) bug 2000
+ - update the savage man page to document the "CrtOnly" option
+
+commit 2cc15aba0bbb540f5562f04a0d39af1dd8dc7ce8
+Author: Alex Deucher <agd5f@yahoo.com>
+Date: Tue Nov 23 05:21:02 2004 +0000
+
+ - fix and enable HW Cursor on crtc2
+ - enable independant CLUT access
+
+commit d6e5b4641667f438cc4513aa01342c2835f18070
+Author: Alex Deucher <agd5f@yahoo.com>
+Date: Tue Nov 23 04:42:37 2004 +0000
+
+ - fixed tiled framebuffer on savage2000
+
+commit 114c3d91262f517ff2a76a5f9d438f4400e9a611
+Author: Felix Kuehling <fxkuehl@gmx.de>
+Date: Sun Oct 31 09:48:55 2004 +0000
+
+ Make the Savage driver work with the dl-loader.
+
+commit 5b6ce4975f129b9d630eeb514507f6ac83111c6b
+Author: Alex Deucher <agd5f@yahoo.com>
+Date: Thu Oct 21 04:31:52 2004 +0000
+
+ Make sure the overlay is off when switching modes, otherwise you can get a
+ chip lockup if you switch modes with a video playing
+
+commit 421efa788e177d91cbe41dedd4f4201c902cbcd5
+Author: Alex Deucher <agd5f@yahoo.com>
+Date: Thu Oct 21 03:58:33 2004 +0000
+
+ when using the overlay for Xv, only enable it when displaying the video
+ otherwise the overlay breaks on mode changes.
+
+commit 951ee8825f2efb34dc4350c26dacd458067b5954
+Author: Felix Kuehling <fxkuehl@gmx.de>
+Date: Wed Oct 20 21:30:56 2004 +0000
+
+ Take doublescan and interlace flags into account when choosing a BIOS mode.
+ Otherwise it choses modes with double refresh rates for double scan
+ modes or half refresh rates for interlaced modes.
+
+commit aed0d07e7ddf045a51f8b1462ad6a5f61dc9e675
+Author: Felix Kuehling <fxkuehl@gmx.de>
+Date: Tue Oct 19 19:35:52 2004 +0000
+
+ Fix a regression in the CrtOnly option. This was fixed in DRI CVS once but
+ must have been lost during the port to Xorg CVS.
+
+commit 352b7566ac11a13bbced74d8a9c8ff944525c097
+Author: Alex Deucher <agd5f@yahoo.com>
+Date: Sat Oct 16 21:10:40 2004 +0000
+
+ - fix savage2000, savage3D
+ - attempt to fix Xv on savage2000 (not there yet)
+
+commit 16af70368f042d6a5c54e57affe7c2e00f782baf
+Author: Alex Deucher <agd5f@yahoo.com>
+Date: Mon Oct 11 23:20:26 2004 +0000
+
+ - fix resume on radeons (bug 1220)
+ - clean up some old cruft in the savage i2c code
+
+commit 83fb89c6e8d75b58134f5068b11f2c3016b9daba
+Author: Alex Deucher <agd5f@yahoo.com>
+Date: Mon Oct 11 03:07:18 2004 +0000
+
+ Turn off vertical interpolation on "old" engines by default. It's bandwidth
+ intensive and causes artifacts on one of my savage4s. I added an Xv
+ attribute, XV_VERTICAL_INTERPOLATION, so users can turn it on and off
+ on the fly.
+
+commit 555da078acfc715053715590eed3c7f1253c0d15
+Author: Alex Deucher <agd5f@yahoo.com>
+Date: Mon Oct 11 00:36:11 2004 +0000
+
+ Fix Xv on savages with the "old" streams engine.
+
+commit 54a78b4d252ba06dd520c5d43ad55b31323408ec
+Author: Alex Deucher <agd5f@yahoo.com>
+Date: Thu Oct 7 03:40:46 2004 +0000
+
+ Require tiled mode for 3D
+
+commit 4c47495cedaf66d96e92373c0b2b453d2a017190
+Author: Alex Deucher <agd5f@yahoo.com>
+Date: Thu Oct 7 02:29:02 2004 +0000
+
+ fix glDrawPixels on Supersavage
+
+commit a9c9f97c80b3c80912fa79551755ff81e79dbbe6
+Author: Alex Deucher <agd5f@yahoo.com>
+Date: Wed Oct 6 04:20:48 2004 +0000
+
+ Small update to the savage man page
+
+commit 640c41b618c61031b1b01f1bd79651e0ddf574ff
+Author: Alex Deucher <agd5f@yahoo.com>
+Date: Wed Oct 6 03:59:22 2004 +0000
+
+ Fix setting the fbOffset in the tiled surface registers on supersavages.
+
+commit 90185e9cd21ea5e5e09955c75fe8bb98b08b2abb
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Tue Oct 5 20:25:55 2004 +0000
+
+ move this function outside of #ifdef XFree86LOADER.
+
+commit 6b44184b17d796fca58323807e7df28efe53b57e
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Thu Sep 30 16:04:36 2004 +0000
+
+ build fix
+
+commit d88b1abf40905ff9b343b047c34460162017ddfc
+Author: Alex Deucher <agd5f@yahoo.com>
+Date: Thu Sep 30 05:31:13 2004 +0000
+
+ Portability fixes from Matthieu Herrb (bug 1409)
+
+commit a1ef17bb2cc069511baaefcbe04298c087533d35
+Author: Alex Deucher <agd5f@yahoo.com>
+Date: Thu Sep 30 04:59:37 2004 +0000
+
+ Add Dualhead Support to Mobile savages (MX, IX, Supersavages) Thanks to
+ Austin Yuan for his help on this.
+
+commit cc1882207d72ce67b650b69bb490ba809dec53f5
+Author: Alex Deucher <agd5f@yahoo.com>
+Date: Tue Sep 28 00:23:21 2004 +0000
+
+ - Properly support BuildDevelDRIDrivers
+ - guard XvMC stuff with XF86DRI
+
+commit fd33023d5ad0b52271bafcdad1c4819c26f3ab91
+Author: Alex Deucher <agd5f@yahoo.com>
+Date: Thu Sep 23 23:28:03 2004 +0000
+
+ small cleanups and corrections
+
+commit c1c94c202bb2e6a39f32056e7bd3fe7477406d9a
+Author: Felix Kuehling <fxkuehl@gmx.de>
+Date: Sat Sep 18 20:23:32 2004 +0000
+
+ vbeFree after SavageWriteMode in SavageCloseScreen.
+
+commit fc8bd5bde48424e47020eae179c8b331ff69595a
+Author: Alex Deucher <agd5f@yahoo.com>
+Date: Sat Sep 18 13:37:30 2004 +0000
+
+ Re-add BIOS panel off code for dpms (Felix Kuehling) Fix weird mode problem
+ on savage4 with dvi and some panels (Felix Kuehling)
+
Reply to: