Hello community, here is the log from the commit of package xorg-x11-driver-video checked in at Thu Dec 7 21:37:19 CET 2006. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2006-11-24 12:26:42.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2006-12-07 12:46:55.000000000 +0100 @@ -1,0 +2,76 @@ +Thu Dec 7 12:42:35 CET 2006 - sndirsch@suse.de + +- updated i810 driver to release 1.7.3 + * Make VIDEO_DEBUG into a configure option + * Fix manpage to report 8160 instead of 6144 for LinearAlloc. + * Add some MergedFB checks for accelerator limitations + * Disable some debug message + * update port attributes immediately when overlay is on. + * Be a little more verbose when rejecting modes. + * Don't crash if SetCursorPosition is called with pScrn->currentMode == NULL. + * Add support for the new DRM memory manager. + * Bug 8594: Fix Xv hang with G965 + * obsoletes patches + - xf86-video-i810-965g-xv-hang.diff + - xf86-video-i810-disable-debug.diff + - xf86-video-i810-linearalloc.diff + - xf86-video-i810-mergedfb-checks.diff + - xf86-video-i810-modelines-verbose.diff + - xf86-video-i810-newdrm.diff + - xf86-video-i810-setcursorposition.diff + - xf86-video-i810-update-port-attributes.diff + - xf86-video-i810-video-debug.diff + +------------------------------------------------------------------- +Tue Dec 5 10:42:08 CET 2006 - sndirsch@suse.de + +- updated nv driver to release 1.2.1 + * Save and restore DAC0 register 608 when probing for connected + CRTs. Adapted from a patch by Egbert Eich for Novell bug + #220197 (obsoletes xf86-video-nv-bug220197.diff). + * Use XORG_RELEASE_VERSION. + * Handle more than 1 digit in the version numbers. Based on a + change by George Sapountzis <gsap7@yahoo.gr>. + * Replace panel message + MODE_BAD with MODE_PANEL. + +------------------------------------------------------------------- +Sun Dec 3 21:57:43 CET 2006 - sndirsch@suse.de + +- updated s3 driver to release 0.5.0 + * Evgeny M. Zubok: Make the driver work with modular X (bug 7112) +- updated mga driver to release 1.4.5 + * Minor typofix that was causing configure to exit with a syntax + error + * Enabled the Exa composite hooks on G550. + * Bug #2168: Fix graphics corruptions with Mystique rev 2. + * Removed some duplicated register definitions. + * Removed some unused defines from mga_reg.h. + * Register name tweak. + * Use register names in MGASaveScreenMerged() rather than magic numbers. + * Replaced more magic values with register names. + * Removed a duplicated register definition. + * Made some XAA function static. +- updated sis driver to release 0.9.3 + * include stdlib.h for strtod +- updated vesa driver to release 1.3.0 + * Fix shadow support yet again. +- updated i128 driver to release 1.2.1 + * Revision-number-only change for sequentiality. +- updated tdfx driver to release 1.3.0 +- updated intel modesetting driver (git_2006-12-04) +- xf86-video-i810-newdrm.diff: + * Add support for the new DRM memory manager + +------------------------------------------------------------------- +Sat Dec 2 22:58:44 CET 2006 - sndirsch@suse.de + +- newdrm.diff obsolete with libdrm 2.3.0 + +------------------------------------------------------------------- +Fri Dec 1 06:36:22 CET 2006 - sndirsch@suse.de + +- bug220197.diff: + Save and restore DAC0 register 608 when probing for connected + CRTs (Bug #220197) + +------------------------------------------------------------------- Old: ---- newdrm.diff p_mga.diff xf86-video-i128-1.1.0.6.tar.bz2 xf86-video-i810-1.7.2.tar.bz2 xf86-video-i810-965g-xv-hang.diff xf86-video-i810-disable-debug.diff xf86-video-i810-linearalloc.diff xf86-video-i810-mergedfb-checks.diff xf86-video-i810-modelines-verbose.diff xf86-video-i810-setcursorposition.diff xf86-video-i810-update-port-attributes.diff xf86-video-i810-video-debug.diff xf86-video-intel.modesetting-20061121.tar.bz2 xf86-video-mga-1.4.4.tar.bz2 xf86-video-nv-1.2.0.tar.bz2 xf86-video-s3-X11R7.1-0.4.1.tar.bz2 xf86-video-sis-0.9.2.tar.bz2 xf86-video-tdfx-1.2.2.tar.bz2 xf86-video-vesa-1.2.2.tar.bz2 New: ---- xf86-video-i128-1.2.1.tar.bz2 xf86-video-i810-1.7.3.tar.bz2 xf86-video-intel.modesetting-20061204.tar.bz2 xf86-video-mga-1.4.5.tar.bz2 xf86-video-nv-1.2.1.tar.bz2 xf86-video-s3-0.5.0.tar.bz2 xf86-video-sis-0.9.3.tar.bz2 xf86-video-tdfx-1.3.0.tar.bz2 xf86-video-vesa-1.3.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.3PQkAg/_old 2006-12-07 21:33:55.000000000 +0100 +++ /var/tmp/diff_new_pack.3PQkAg/_new 2006-12-07 21:33:55.000000000 +0100 @@ -14,7 +14,7 @@ BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk URL: http://xorg.freedesktop.org/ Version: 7.2 -Release: 31 +Release: 33 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -31,21 +31,21 @@ Source7: xf86-video-dummy-X11R7.1-0.2.0.tar.bz2 Source8: xf86-video-fbdev-X11R7.1-0.3.0.tar.bz2 Source9: xf86-video-glint-X11R7.1-1.1.1.tar.bz2 -Source10: xf86-video-i128-1.1.0.6.tar.bz2 +Source10: xf86-video-i128-1.2.1.tar.bz2 Source11: xf86-video-i740-X11R7.1-1.1.0.tar.bz2 -Source12: xf86-video-i810-1.7.2.tar.bz2 +Source12: xf86-video-i810-1.7.3.tar.bz2 Source13: xf86-video-imstt-X11R7.1-1.1.0.tar.bz2 -Source14: xf86-video-mga-1.4.4.tar.bz2 +Source14: xf86-video-mga-1.4.5.tar.bz2 Source15: xf86-video-neomagic-X11R7.1-1.1.1.tar.bz2 Source16: xf86-video-newport-0.2.1.tar.bz2 Source17: xf86-video-nsc-2.8.2.tar.bz2 -Source18: xf86-video-nv-1.2.0.tar.bz2 +Source18: xf86-video-nv-1.2.1.tar.bz2 Source19: xf86-video-rendition-4.1.2.tar.bz2 -Source20: xf86-video-s3-X11R7.1-0.4.1.tar.bz2 +Source20: xf86-video-s3-0.5.0.tar.bz2 Source21: xf86-video-s3virge-X11R7.1-1.9.1.tar.bz2 Source22: xf86-video-savage-2.1.2.tar.bz2 Source23: xf86-video-siliconmotion-1.4.2.tar.bz2 -Source24: xf86-video-sis-0.9.2.tar.bz2 +Source24: xf86-video-sis-0.9.3.tar.bz2 Source25: xf86-video-sisusb-X11R7.1-0.8.1.tar.bz2 Source26: xf86-video-sunbw2-X11R7.1-1.1.0.tar.bz2 Source27: xf86-video-suncg14-X11R7.1-1.1.0.tar.bz2 @@ -54,24 +54,23 @@ Source30: xf86-video-sunffb-X11R7.1-1.1.0.tar.bz2 Source31: xf86-video-sunleo-X11R7.1-1.1.0.tar.bz2 Source32: xf86-video-suntcx-X11R7.1-1.1.0.tar.bz2 -Source33: xf86-video-tdfx-1.2.2.tar.bz2 +Source33: xf86-video-tdfx-1.3.0.tar.bz2 Source34: xf86-video-tga-X11R7.1-1.1.0.tar.bz2 Source35: xf86-video-trident-1.2.3.tar.bz2 Source36: xf86-video-tseng-1.1.1.tar.bz2 Source37: xf86-video-v4l-X11R7.1-0.1.1.tar.bz2 -Source38: xf86-video-vesa-1.2.2.tar.bz2 +Source38: xf86-video-vesa-1.3.0.tar.bz2 Source39: xf86-video-vga-X11R7.1-4.1.0.tar.bz2 Source40: xf86-video-via-0.2.2.tar.bz2 Source41: xf86-video-vmware-10.14.0.tar.bz2 Source42: xf86-video-voodoo-1.1.1.tar.bz2 Source43: xf86-video-impact-0.2.0.tar.bz2 Source44: HALlib-4.1.tar.gz -Source45: xf86-video-intel.modesetting-20061121.tar.bz2 +Source45: xf86-video-intel.modesetting-20061204.tar.bz2 Patch1: radeon-xrandr-dotclock.diff Patch2: radeon_dell.diff Patch3: ps_nv.diff Patch5: mga-g200se_pci-fix.diff -Patch6: p_mga.diff Patch9: xf86-video-sunffb.diff Patch10: xf86-video-tdfx.diff Patch11: xf86-video-glint.diff @@ -81,16 +80,7 @@ Patch16: xf86-video-nsc.diff Patch17: p_i810-refresh.diff Patch18: radeon-vbios-ppc.diff -Patch19: xf86-video-i810-video-debug.diff -Patch20: xf86-video-i810-linearalloc.diff -Patch21: xf86-video-i810-setcursorposition.diff -Patch22: xf86-video-i810-mergedfb-checks.diff -Patch23: xf86-video-i810-965g-xv-hang.diff Patch24: xf86-video-intel.modesetting.diff -Patch25: newdrm.diff -Patch26: xf86-video-i810-disable-debug.diff -Patch27: xf86-video-i810-update-port-attributes.diff -Patch28: xf86-video-i810-modelines-verbose.diff Patch29: xf86-video-fbdev-disable-shadowfb.diff %description @@ -113,7 +103,6 @@ pushd xf86-video-mga-*/src tar xzf %{SOURCE44} %patch5 -p1 -%patch6 -p1 popd pushd xf86-video-mga-* %ifarch %ix86 @@ -142,18 +131,9 @@ pushd xf86-video-i810-* ### disabled for now #%patch17 -%patch19 -p1 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -p1 -%patch26 -p1 -%patch27 -p1 -%patch28 -p1 popd pushd xf86-video-intel.modesetting %patch24 -p0 -%patch25 -p1 -R mv man/i810.man man/i810beta.man popd @@ -214,6 +194,67 @@ %{_mandir}/man4/* %changelog -n xorg-x11-driver-video +* Thu Dec 07 2006 - sndirsch@suse.de +- updated i810 driver to release 1.7.3 + * Make VIDEO_DEBUG into a configure option + * Fix manpage to report 8160 instead of 6144 for LinearAlloc. + * Add some MergedFB checks for accelerator limitations + * Disable some debug message + * update port attributes immediately when overlay is on. + * Be a little more verbose when rejecting modes. + * Don't crash if SetCursorPosition is called with pScrn->currentMode == NULL. + * Add support for the new DRM memory manager. + * Bug 8594: Fix Xv hang with G965 + * obsoletes patches + - xf86-video-i810-965g-xv-hang.diff + - xf86-video-i810-disable-debug.diff + - xf86-video-i810-linearalloc.diff + - xf86-video-i810-mergedfb-checks.diff + - xf86-video-i810-modelines-verbose.diff + - xf86-video-i810-newdrm.diff + - xf86-video-i810-setcursorposition.diff + - xf86-video-i810-update-port-attributes.diff + - xf86-video-i810-video-debug.diff +* Tue Dec 05 2006 - sndirsch@suse.de +- updated nv driver to release 1.2.1 + * Save and restore DAC0 register 608 when probing for connected + CRTs. Adapted from a patch by Egbert Eich for Novell bug + [#220197] (obsoletes xf86-video-nv-bug220197.diff). + * Use XORG_RELEASE_VERSION. + * Handle more than 1 digit in the version numbers. Based on a + change by George Sapountzis <gsap7@yahoo.gr>. + * Replace panel message + MODE_BAD with MODE_PANEL. +* Sun Dec 03 2006 - sndirsch@suse.de +- updated s3 driver to release 0.5.0 + * Evgeny M. Zubok: Make the driver work with modular X (bug 7112) +- updated mga driver to release 1.4.5 + * Minor typofix that was causing configure to exit with a syntax + error + * Enabled the Exa composite hooks on G550. + * Bug #2168: Fix graphics corruptions with Mystique rev 2. + * Removed some duplicated register definitions. + * Removed some unused defines from mga_reg.h. + * Register name tweak. + * Use register names in MGASaveScreenMerged() rather than magic numbers. + * Replaced more magic values with register names. + * Removed a duplicated register definition. + * Made some XAA function static. +- updated sis driver to release 0.9.3 + * include stdlib.h for strtod +- updated vesa driver to release 1.3.0 + * Fix shadow support yet again. +- updated i128 driver to release 1.2.1 + * Revision-number-only change for sequentiality. +- updated tdfx driver to release 1.3.0 +- updated intel modesetting driver (git_2006-12-04) +- xf86-video-i810-newdrm.diff: + * Add support for the new DRM memory manager +* Sat Dec 02 2006 - sndirsch@suse.de +- newdrm.diff obsolete with libdrm 2.3.0 +* Fri Dec 01 2006 - sndirsch@suse.de +- bug220197.diff: + Save and restore DAC0 register 608 when probing for connected + CRTs (Bug #220197) * Fri Nov 24 2006 - sndirsch@suse.de - xf86-video-fbdev-disable-shadowfb.diff: * fbdev: disable use of shadowfb by default (Bug #220171) ++++++ mga-g200se_pci-fix.diff ++++++ --- /var/tmp/diff_new_pack.3PQkAg/_old 2006-12-07 21:33:55.000000000 +0100 +++ /var/tmp/diff_new_pack.3PQkAg/_new 2006-12-07 21:33:55.000000000 +0100 @@ -1,18 +1,3 @@ -diff -u -r mga.orig/mga_dacG.c mga/mga_dacG.c ---- mga.orig/mga_dacG.c 2006-06-01 15:57:34.000000000 +0200 -+++ mga/mga_dacG.c 2006-06-01 15:59:19.000000000 +0200 -@@ -415,10 +415,7 @@ - pReg->DacRegs[ MGA1064_VREF_CTL ] = 0x03; - pReg->DacRegs[ MGA1064_PIX_CLK_CTL ] = 0x01; - pReg->DacRegs[ MGA1064_MISC_CTL ] = 0x19; -- if(pMga->HasSDRAM) -- pReg->Option = 0x40499121; -- else -- pReg->Option = 0x4049cd21; -+ pReg->Option = 0x40049120; - pReg->Option2 = 0x00008000; - break; - case PCI_CHIP_MGAG200: diff -u -r mga.orig/mga_driver.c mga/mga_driver.c --- mga.orig/mga_driver.c 2006-06-01 15:57:34.000000000 +0200 +++ mga/mga_driver.c 2006-06-01 16:07:06.000000000 +0200 @@ -56,3 +41,17 @@ pMga->CurrentLayout.mode = mode; if(pMga->MergedFB && mode->Private && (mode->PrivSize == 0)) { +--- src/mga_dacG.c.orig 2006-12-03 23:06:32.908071711 +0100 ++++ src/mga_dacG.c 2006-12-03 23:07:36.086463534 +0100 +@@ -422,10 +422,7 @@ + MGA1064_MISC_CTL_VGA8 | + MGA1064_MISC_CTL_DAC_RAM_CS; + +- if(pMga->HasSDRAM) +- pReg->Option = 0x40499121; +- else +- pReg->Option = 0x4049cd21; ++ pReg->Option = 0x40049120; + pReg->Option2 = 0x00008000; + break; + case PCI_CHIP_MGAG200: ++++++ xf86-video-i128-1.1.0.6.tar.bz2 -> xf86-video-i128-1.2.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-i128-1.1.0.6/configure new/xf86-video-i128-1.2.1/configure --- old/xf86-video-i128-1.1.0.6/configure 2006-10-14 00:31:16.000000000 +0200 +++ new/xf86-video-i128-1.2.1/configure 2006-12-01 23:29:44.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for xf86-video-i128 1.1.0.6. +# Generated by GNU Autoconf 2.59 for xf86-video-i128 1.2.1. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -423,8 +423,8 @@ # Identity of this package. PACKAGE_NAME='xf86-video-i128' PACKAGE_TARNAME='xf86-video-i128' -PACKAGE_VERSION='1.1.0.6' -PACKAGE_STRING='xf86-video-i128 1.1.0.6' +PACKAGE_VERSION='1.2.1' +PACKAGE_STRING='xf86-video-i128 1.2.1' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_unique_file="Makefile.am" @@ -966,7 +966,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xf86-video-i128 1.1.0.6 to adapt to many kinds of systems. +\`configure' configures xf86-video-i128 1.2.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1032,7 +1032,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xf86-video-i128 1.1.0.6:";; + short | recursive ) echo "Configuration of xf86-video-i128 1.2.1:";; esac cat <<\_ACEOF @@ -1181,7 +1181,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -xf86-video-i128 configure 1.1.0.6 +xf86-video-i128 configure 1.2.1 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1195,7 +1195,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xf86-video-i128 $as_me 1.1.0.6, which was +It was created by xf86-video-i128 $as_me 1.2.1, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1843,7 +1843,7 @@ # Define the identity of the package. PACKAGE='xf86-video-i128' - VERSION='1.1.0.6' + VERSION='1.2.1' cat >>confdefs.h <<_ACEOF @@ -20824,7 +20824,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by xf86-video-i128 $as_me 1.1.0.6, which was +This file was extended by xf86-video-i128 $as_me 1.2.1, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20887,7 +20887,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -xf86-video-i128 config.status 1.1.0.6 +xf86-video-i128 config.status 1.2.1 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-i128-1.1.0.6/configure.ac new/xf86-video-i128-1.2.1/configure.ac --- old/xf86-video-i128-1.1.0.6/configure.ac 2006-10-14 00:31:02.000000000 +0200 +++ new/xf86-video-i128-1.2.1/configure.ac 2006-12-01 23:28:40.000000000 +0100 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-i128], - 1.1.0.6, + 1.2.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-i128) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-i128-1.1.0.6/src/i128_driver.c new/xf86-video-i128-1.2.1/src/i128_driver.c --- old/xf86-video-i128-1.1.0.6/src/i128_driver.c 2006-10-12 00:25:36.000000000 +0200 +++ new/xf86-video-i128-1.2.1/src/i128_driver.c 2006-12-01 23:28:58.000000000 +0100 @@ -117,8 +117,8 @@ #define I128_NAME "I128" #define I128_DRIVER_NAME "i128" #define I128_MAJOR_VERSION 1 -#define I128_MINOR_VERSION 1 -#define I128_PATCHLEVEL 0 +#define I128_MINOR_VERSION 2 +#define I128_PATCHLEVEL 1 /* * This contains the functions needed by the server after loading the ++++++ xf86-video-i128-1.1.0.6.tar.bz2 -> xf86-video-i810-1.7.3.tar.bz2 ++++++ ++++ 67923 lines of diff (skipped) ++++++ xf86-video-intel.modesetting-20061121.tar.bz2 -> xf86-video-intel.modesetting-20061204.tar.bz2 ++++++ ++++ 12111 lines of diff (skipped) ++++++ xf86-video-mga-1.4.4.tar.bz2 -> xf86-video-mga-1.4.5.tar.bz2 ++++++ ++++ 19566 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mga-1.4.4/ChangeLog new/xf86-video-mga-1.4.5/ChangeLog --- old/xf86-video-mga-1.4.4/ChangeLog 2006-10-27 21:28:50.000000000 +0200 +++ new/xf86-video-mga-1.4.5/ChangeLog 2006-11-30 19:00:05.000000000 +0100 @@ -1,3 +1,73 @@ +commit 00efdc4959a0b240eb2dc7a3188c0ef64b2ad74a +Author: Daniel Stone <daniel@fooishbar.org> +Date: Thu Nov 30 19:59:38 2006 +0200 + + bump to 1.4.5 + +commit 5bbafd77678a2b0f82e820aa98337a014d284554 +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Sun Nov 26 18:06:12 2006 +0100 + + Made some XAA function static. + +commit 4778901bb13a950285c55ea6f058e94ee7b03652 +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Sun Nov 26 16:21:34 2006 +0100 + + Removed a duplicated register definition. + +commit f9d83ad601c8cba197e96f0b907f1dae6134953b +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Sun Nov 26 16:17:12 2006 +0100 + + Replaced more magic values with register names. + +commit 6df85941ce077e1eee8b43945c51ab1b0906c758 +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Sun Nov 26 15:39:54 2006 +0100 + + Use register names in MGASaveScreenMerged() rather than magic numbers. + +commit b3ee69f6ac058e52d5175f611090baa76eed49f9 +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Sun Nov 26 15:24:46 2006 +0100 + + Register name tweak. + + The "DAC power down" register powers down the DAC when it's + set to zero, and enables it when it's set to one. + To avoid confusion, I renamed it. + +commit 0f8c42fe75c6da9e7ea4aeb33b71778551c61528 +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Sat Nov 25 17:08:15 2006 +0100 + + Removed some unused defines from mga_reg.h. + +commit 334c7237078652722d7dec1c74812af46bfd7c67 +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Sat Nov 25 16:42:49 2006 +0100 + + Removed some duplicated register definitions. + +commit be88d58968c604624617f40820dc9a50a92661be +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Sun Nov 19 21:04:01 2006 +0100 + + Bug #2168: Fix graphics corruptions with Mystique rev 2. + +commit daeecb63567fb394654c9e66d64c3c53658f2c7d +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Fri Nov 17 23:08:25 2006 +0100 + + Enabled the Exa composite hooks on G550. + +commit d69607fe8b2dfb6c539dbf9f2b2996d04a4a838a +Author: David Nusinow <dnusinow@debian.org> +Date: Mon Nov 6 23:58:06 2006 -0500 + + Minor typofix that was causing configure to exit with a syntax error + commit 1dd6e6995d7a37338dce6ee5b1aa4ee9dd848e1d Author: Ian Romanick <idr@us.ibm.com> Date: Fri Oct 27 11:53:40 2006 -0700 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mga-1.4.4/configure.ac new/xf86-video-mga-1.4.5/configure.ac --- old/xf86-video-mga-1.4.4/configure.ac 2006-10-27 20:50:02.000000000 +0200 +++ new/xf86-video-mga-1.4.5/configure.ac 2006-11-30 18:59:28.000000000 +0100 @@ -24,7 +24,7 @@ # When the version number is modified here, also modify it in src/mga.h. AC_INIT([xf86-video-mga], - 1.4.4, + 1.4.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-mga) @@ -55,7 +55,7 @@ [DRI=auto]) AC_ARG_ENABLE(exa, AC_HELP_STRING([--disable-exa], - [Disable EXA support [[default enabled]]]), + [Disable EXA support [[default=enabled]]]), [EXA="$enableval"], [EXA=yes]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mga-1.4.4/src/mga_dacG.c new/xf86-video-mga-1.4.5/src/mga_dacG.c --- old/xf86-video-mga-1.4.4/src/mga_dacG.c 2006-10-27 20:27:13.000000000 +0200 +++ new/xf86-video-mga-1.4.5/src/mga_dacG.c 2006-11-30 18:59:07.000000000 +0100 @@ -332,7 +332,8 @@ break; case PCI_CHIP_MGAG100: case PCI_CHIP_MGAG100_PCI: - pReg->DacRegs[ MGAGDAC_XVREFCTRL ] = 0x03; + pReg->DacRegs[MGA1064_VREF_CTL] = 0x03; + if(pMga->HasSDRAM) { if(pMga->OverclockMem) { /* 220 Mhz */ @@ -413,8 +414,14 @@ MGA_HAL(break;); #endif pReg->DacRegs[ MGA1064_VREF_CTL ] = 0x03; - pReg->DacRegs[ MGA1064_PIX_CLK_CTL ] = 0x01; - pReg->DacRegs[ MGA1064_MISC_CTL ] = 0x19; + pReg->DacRegs[MGA1064_PIX_CLK_CTL] = + MGA1064_PIX_CLK_CTL_SEL_PLL; + + pReg->DacRegs[MGA1064_MISC_CTL] = + MGA1064_MISC_CTL_DAC_EN | + MGA1064_MISC_CTL_VGA8 | + MGA1064_MISC_CTL_DAC_RAM_CS; + if(pMga->HasSDRAM) pReg->Option = 0x40499121; else @@ -565,7 +572,11 @@ MGA_NOT_HAL(pReg->DacRegs[MGA1064_CURSOR_BASE_ADR_HI] = pMga->FbCursorOffset >> 18); if (pMga->SyncOnGreen) { - MGA_NOT_HAL(pReg->DacRegs[MGA1064_GEN_CTL] &= ~0x20); + MGA_NOT_HAL( + pReg->DacRegs[MGA1064_GEN_CTL] &= + ~MGA1064_GEN_CTL_SYNC_ON_GREEN_DIS; + ); + pReg->ExtVga[3] |= 0x40; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mga-1.4.4/src/mga_exa.c new/xf86-video-mga-1.4.5/src/mga_exa.c --- old/xf86-video-mga-1.4.4/src/mga_exa.c 2006-10-27 04:48:24.000000000 +0200 +++ new/xf86-video-mga-1.4.5/src/mga_exa.c 2006-11-30 18:59:07.000000000 +0100 @@ -797,7 +797,8 @@ pExa->Copy = mgaCopy; pExa->DoneCopy = mgaNoopDone; - if (pMga->Chipset == PCI_CHIP_MGAG400) { + if (pMga->Chipset == PCI_CHIP_MGAG400 || + pMga->Chipset == PCI_CHIP_MGAG550) { pExa->CheckComposite = mgaCheckComposite; pExa->PrepareComposite = mgaPrepareComposite; pExa->Composite = mgaComposite; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mga-1.4.4/src/mga_merge.c new/xf86-video-mga-1.4.5/src/mga_merge.c --- old/xf86-video-mga-1.4.4/src/mga_merge.c 2006-10-27 04:48:24.000000000 +0200 +++ new/xf86-video-mga-1.4.5/src/mga_merge.c 2006-11-30 18:59:07.000000000 +0100 @@ -947,23 +947,28 @@ if (on) { /* SetTimdeSinceLastInputEvent();*/ - + /* power on Dac1 */ - reg = inMGAdac(0x1E); - outMGAdac(0x1E, reg | 1); + reg = inMGAdac(MGA1064_MISC_CTL); + reg |= MGA1064_MISC_CTL_DAC_EN; + outMGAdac(MGA1064_MISC_CTL, reg); + /* power on Dac2 */ - reg = inMGAdac(0xA0); - outMGAdac(0xA0, reg | 1); - + reg = inMGAdac(MGA1064_PWR_CTL); + reg |= 1; + outMGAdac(MGA1064_PWR_CTL, reg); } else { /* power off Dac1 */ - reg = inMGAdac(0x1E); - outMGAdac(0x1E, reg & ~1); - /* power off Dac2 */ - reg = inMGAdac(0xA0); - outMGAdac(0xA0, reg & ~1); + reg = inMGAdac(MGA1064_MISC_CTL); + reg &= ~MGA1064_MISC_CTL_DAC_EN; + outMGAdac(MGA1064_MISC_CTL, reg); + /* power off Dac2 */ + reg = inMGAdac(MGA1064_PWR_CTL); + reg &= ~1; + outMGAdac(MGA1064_PWR_CTL, reg); } + return TRUE; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mga-1.4.4/src/mga_reg.h new/xf86-video-mga-1.4.5/src/mga_reg.h --- old/xf86-video-mga-1.4.4/src/mga_reg.h 2006-10-27 04:48:24.000000000 +0200 +++ new/xf86-video-mga-1.4.5/src/mga_reg.h 2006-11-30 18:59:07.000000000 +0100 @@ -355,7 +355,6 @@ #define MGA1064_MUL_CTL_G16V16bits 0x06 #define MGA1064_MUL_CTL_32_24bits 0x07 -#define MGAGDAC_XVREFCTRL 0x18 #define MGA1064_PIX_CLK_CTL 0x1a #define MGA1064_PIX_CLK_CTL_CLK_DIS ( 0x01 << 2 ) #define MGA1064_PIX_CLK_CTL_CLK_POW_DOWN ( 0x01 << 3 ) @@ -365,8 +364,9 @@ #define MGA1064_PIX_CLK_CTL_SEL_MSK ( 0x03 << 0 ) #define MGA1064_GEN_CTL 0x1d +#define MGA1064_GEN_CTL_SYNC_ON_GREEN_DIS (0x01 << 5) #define MGA1064_MISC_CTL 0x1e -#define MGA1064_MISC_CTL_DAC_POW_DN ( 0x01 << 0 ) +#define MGA1064_MISC_CTL_DAC_EN ( 0x01 << 0 ) #define MGA1064_MISC_CTL_VGA ( 0x01 << 1 ) #define MGA1064_MISC_CTL_DIS_CON ( 0x03 << 1 ) #define MGA1064_MISC_CTL_MAFC ( 0x02 << 1 ) @@ -402,10 +402,6 @@ #define MGA1064_PIX_PLL_STAT 0x4f /*Added for G450 dual head*/ -/* Supported PLL*/ -#define __PIXEL_PLL 1 -#define __SYSTEM_PLL 2 -#define __VIDEO_PLL 3 #define MGA1064_VID_PLL_P 0x8D #define MGA1064_VID_PLL_M 0x8E @@ -437,10 +433,6 @@ #define MGAREG_C2OFFSET 0x3c40 #define MGAREG_C2DATACTL 0x3c4c -#define MGA1064_DISP_CTL 0x8a -#define MGA1064_SYNC_CTL 0x8b -#define MGA1064_PWR_CTL 0xa0 - /* video register */ #define MGAREG_BESA1C3ORG 0x3d60 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mga-1.4.4/src/mga_storm.c new/xf86-video-mga-1.4.5/src/mga_storm.c --- old/xf86-video-mga-1.4.4/src/mga_storm.c 2006-10-27 04:48:24.000000000 +0200 +++ new/xf86-video-mga-1.4.5/src/mga_storm.c 2006-11-30 18:59:07.000000000 +0100 @@ -141,7 +141,7 @@ int x1, int y1, int x2, int y2, int flags, int phase ); #endif -void mgaRestoreAccelState( ScrnInfoPtr pScrn ); +static void mgaRestoreAccelState( ScrnInfoPtr pScrn ); #ifdef XF86DRI void mgaDRIInitBuffers(WindowPtr pWin, RegionPtr prgn, CARD32 index); @@ -149,21 +149,21 @@ RegionPtr prgnSrc, CARD32 index); #endif -extern void MGASetClippingRectangle(ScrnInfoPtr pScrn, int x1, int y1, +static void MGASetClippingRectangle(ScrnInfoPtr pScrn, int x1, int y1, int x2, int y2); -extern void MGADisableClipping(ScrnInfoPtr pScrn); -extern void MGAFillSolidRectsDMA(ScrnInfoPtr pScrn, int fg, int rop, +static void MGADisableClipping(ScrnInfoPtr pScrn); +static void MGAFillSolidRectsDMA(ScrnInfoPtr pScrn, int fg, int rop, unsigned int planemask, int nBox, BoxPtr pBox); -extern void MGAFillSolidSpansDMA(ScrnInfoPtr pScrn, int fg, int rop, +static void MGAFillSolidSpansDMA(ScrnInfoPtr pScrn, int fg, int rop, unsigned int planemask, int n, DDXPointPtr ppt, int *pwidth, int fSorted); -extern void MGAFillMono8x8PatternRectsTwoPass(ScrnInfoPtr pScrn, int fg, int bg, +static void MGAFillMono8x8PatternRectsTwoPass(ScrnInfoPtr pScrn, int fg, int bg, int rop, unsigned int planemask, int nBox, BoxPtr pBox, int pattern0, int pattern1, int xorigin, int yorigin); -extern void MGAValidatePolyArc(GCPtr, unsigned long, DrawablePtr); -extern void MGAValidatePolyPoint(GCPtr, unsigned long, DrawablePtr); -extern void MGAFillCacheBltRects(ScrnInfoPtr, int, unsigned int, int, BoxPtr, +static void MGAValidatePolyArc(GCPtr, unsigned long, DrawablePtr); +static void MGAValidatePolyPoint(GCPtr, unsigned long, DrawablePtr); +static void MGAFillCacheBltRects(ScrnInfoPtr, int, unsigned int, int, BoxPtr, int, int, XAACacheInfoPtr); @@ -220,8 +220,8 @@ #include "mipict.h" #include "dixstruct.h" -CARD32 MGAAlphaTextureFormats[2] = {PICT_a8, 0}; -CARD32 MGATextureFormats[2] = {PICT_a8r8g8b8, 0}; +static CARD32 MGAAlphaTextureFormats[2] = {PICT_a8, 0}; +static CARD32 MGATextureFormats[2] = {PICT_a8r8g8b8, 0}; static void RemoveLinear (FBLinearPtr linear) @@ -1007,7 +1007,7 @@ /* Support for multiscreen */ -void mgaRestoreAccelState(ScrnInfoPtr pScrn) +static void mgaRestoreAccelState(ScrnInfoPtr pScrn) { MGAPtr pMga = MGAPTR(pScrn); MGAFBLayout *pLayout = &pMga->CurrentLayout; @@ -1089,8 +1089,8 @@ CHECK_DMA_QUIESCENT(pMga, pScrn); - /* MGAISBUSY() reportedly causes a freeze for Mystique revision 2 and older */ - if (!(pMga->Chipset == PCI_CHIP_MGA1064 && (pMga->ChipRev >= 0 && pMga->ChipRev <= 2))) + /* MGAISBUSY() reportedly causes a freeze for Mystique revisions 0 and 1 */ + if (!(pMga->Chipset == PCI_CHIP_MGA1064 && (pMga->ChipRev >= 0 && pMga->ChipRev <= 1))) while(MGAISBUSY()); /* flush cache before a read (mga-1064g 5.1.6) */ OUTREG8(MGAREG_CRTC_INDEX, 0); @@ -1191,7 +1191,8 @@ } -void MGASetClippingRectangle( +static void +MGASetClippingRectangle( ScrnInfoPtr pScrn, int x1, int y1, int x2, int y2 ){ @@ -1206,7 +1207,8 @@ pMga->AccelFlags |= CLIPPER_ON; } -void MGADisableClipping(ScrnInfoPtr pScrn) +static void +MGADisableClipping(ScrnInfoPtr pScrn) { MGAPtr pMga = MGAPTR(pScrn); @@ -2212,7 +2214,7 @@ } -void +static void MGAFillSolidRectsDMA( ScrnInfoPtr pScrn, int fg, int rop, @@ -2253,7 +2255,7 @@ OUTREG(MGAREG_OPMODE, MGAOPM_DMA_BLIT); } -void +static void MGAFillSolidSpansDMA( ScrnInfoPtr pScrn, int fg, int rop, @@ -2312,7 +2314,7 @@ } -void +static void MGAFillMono8x8PatternRectsTwoPass( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -2365,7 +2367,7 @@ } -void +static void MGAValidatePolyArc( GCPtr pGC, unsigned long changes, @@ -2452,7 +2454,7 @@ } -void +static void MGAValidatePolyPoint( GCPtr pGC, unsigned long changes, @@ -2476,7 +2478,7 @@ } -void +static void MGAFillCacheBltRects( ScrnInfoPtr pScrn, int rop, ++++++ xf86-video-nv-1.2.0.tar.bz2 -> xf86-video-nv-1.2.1.tar.bz2 ++++++ ++++ 13035 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-nv-1.2.0/ChangeLog new/xf86-video-nv-1.2.1/ChangeLog --- old/xf86-video-nv-1.2.0/ChangeLog 2006-06-30 21:59:13.000000000 +0200 +++ new/xf86-video-nv-1.2.1/ChangeLog 2006-12-01 19:57:41.000000000 +0100 @@ -1,3 +1,37 @@ +commit 2d4b4bb06029e60e5c7b96d94b31c8aadac91843 +Author: Aaron Plattner <aplattner@nvidia.com> +Date: Thu Nov 30 17:41:41 2006 -0800 + + Bump to 1.2.1. + +commit 558ef7e26e361529a05360610abc3cbcdb04fd67 +Author: Aaron Plattner <aplattner@nvidia.com> +Date: Thu Nov 30 17:36:29 2006 -0800 + + Save and restore DAC0 register 608 when probing for connected CRTs. + + Adapted from a patch by Egbert Eich for Novell bug #220197. + +commit 08bb966abbca11c4581d666af3249e4922156e03 +Author: Aaron Plattner <aplattner@nvidia.com> +Date: Thu Nov 30 17:14:38 2006 -0800 + + Use XORG_RELEASE_VERSION. + +commit 162391f8fb640184db3917f3842fbff0bc9ce606 +Author: Aaron Plattner <aplattner@nvidia.com> +Date: Thu Oct 26 19:08:29 2006 -0700 + + Handle more than 1 digit in the version numbers. + + Based on a change by George Sapountzis <gsap7@yahoo.gr>. + +commit 98372d0f94a9d658a7257d2199ef37a2449b9961 +Author: Adam Jackson <ajax@benzedrine.nwnk.net> +Date: Fri Aug 11 16:02:28 2006 -0400 + + Replace panel message + MODE_BAD with MODE_PANEL. + commit 43ec66396f805aba87017d193d97a03372c29909 Author: Aaron Plattner <aplattner@nvidia.com> Date: Fri Jun 30 12:54:44 2006 -0700 @@ -560,4 +594,3 @@ Date: Fri Nov 14 15:54:48 2003 +0000 R6.6 is the Xorg base-line - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-nv-1.2.0/config.h.in new/xf86-video-nv-1.2.1/config.h.in --- old/xf86-video-nv-1.2.0/config.h.in 2006-06-30 21:50:06.000000000 +0200 +++ new/xf86-video-nv-1.2.1/config.h.in 2006-12-01 19:57:41.000000000 +0100 @@ -35,15 +35,6 @@ /* XV hooks take a DrawablePtr */ #undef HAVE_XV_DRAWABLE -/* Major version */ -#undef NV_MAJOR_VERSION - -/* Minor version */ -#undef NV_MINOR_VERSION - -/* Patch version */ -#undef NV_PATCHLEVEL - /* Name of package */ #undef PACKAGE @@ -62,6 +53,15 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* Major version of this package */ +#undef PACKAGE_VERSION_MAJOR + +/* Minor version of this package */ +#undef PACKAGE_VERSION_MINOR + +/* Patch version of this package */ +#undef PACKAGE_VERSION_PATCHLEVEL + /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-nv-1.2.0/configure.ac new/xf86-video-nv-1.2.1/configure.ac --- old/xf86-video-nv-1.2.0/configure.ac 2006-06-30 21:49:05.000000000 +0200 +++ new/xf86-video-nv-1.2.1/configure.ac 2006-12-01 02:41:34.000000000 +0100 @@ -22,19 +22,11 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-nv], - 1.2.0, + 1.2.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-nv) -AC_DEFINE_UNQUOTED([NV_MAJOR_VERSION], - [$(echo $PACKAGE_VERSION | sed -e 's/^\([[0-9]]\)\.[[0-9]]\.[[0-9]]/\1/')], - [Major version]) -AC_DEFINE_UNQUOTED([NV_MINOR_VERSION], - [$(echo $PACKAGE_VERSION | sed -e 's/^[[0-9]]\.\([[0-9]]\)\.[[0-9]]/\1/')], - [Minor version]) -AC_DEFINE_UNQUOTED([NV_PATCHLEVEL], - [$(echo $PACKAGE_VERSION | sed -e 's/^[[0-9]]\.[[0-9]]\.\([[0-9]]\)/\1/')], - [Patch version]) +XORG_RELEASE_VERSION AC_CONFIG_SRCDIR([Makefile.am]) AM_CONFIG_HEADER([config.h]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-nv-1.2.0/src/nv_driver.c new/xf86-video-nv-1.2.1/src/nv_driver.c --- old/xf86-video-nv-1.2.0/src/nv_driver.c 2006-06-30 18:33:22.000000000 +0200 +++ new/xf86-video-nv-1.2.1/src/nv_driver.c 2006-12-01 02:12:36.000000000 +0100 @@ -458,7 +458,7 @@ MODINFOSTRING1, MODINFOSTRING2, XORG_VERSION_CURRENT, - NV_MAJOR_VERSION, NV_MINOR_VERSION, NV_PATCHLEVEL, + PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL, ABI_CLASS_VIDEODRV, /* This is a video driver */ ABI_VIDEODRV_VERSION, MOD_CLASS_VIDEODRV, @@ -953,14 +953,9 @@ { NVPtr pNv = NVPTR(xf86Screens[scrnIndex]); - if(pNv->fpWidth && pNv->fpHeight) { - if((pNv->fpWidth < mode->HDisplay) || (pNv->fpHeight < mode->VDisplay)) { - xf86DrvMsg(scrnIndex, X_INFO, "Mode \"%s\" is larger than " - "BIOS programmed panel size of %d x %d. Removing.\n", - mode->name, pNv->fpWidth, pNv->fpHeight); - return (MODE_BAD); - } - } + if(pNv->fpWidth && pNv->fpHeight) + if((pNv->fpWidth < mode->HDisplay) || (pNv->fpHeight < mode->VDisplay)) + return (MODE_PANEL); return (MODE_OK); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-nv-1.2.0/src/nv_setup.c new/xf86-video-nv-1.2.1/src/nv_setup.c --- old/xf86-video-nv-1.2.0/src/nv_setup.c 2006-06-17 02:48:53.000000000 +0200 +++ new/xf86-video-nv-1.2.1/src/nv_setup.c 2006-12-01 02:29:39.000000000 +0100 @@ -174,14 +174,17 @@ { NVPtr pNv = NVPTR(pScrn); volatile U032 *PRAMDAC = pNv->PRAMDAC0; - CARD32 reg52C, reg608; + CARD32 reg52C, reg608, dac0_reg608; Bool present; xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Probing for analog device on output %s...\n", output ? "B" : "A"); - if(output) PRAMDAC += 0x800; + if(output) { + dac0_reg608 = PRAMDAC[0x0608/4]; + PRAMDAC += 0x800; + } reg52C = PRAMDAC[0x052C/4]; reg608 = PRAMDAC[0x0608/4]; @@ -204,7 +207,8 @@ else xf86DrvMsg(pScrn->scrnIndex, X_PROBED, " ...can't find one\n"); - pNv->PRAMDAC0[0x0608/4] &= 0x0000EFFF; + if(output) + pNv->PRAMDAC0[0x0608/4] = dac0_reg608; PRAMDAC[0x052C/4] = reg52C; PRAMDAC[0x0608/4] = reg608; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-nv-1.2.0/src/riva_driver.c new/xf86-video-nv-1.2.1/src/riva_driver.c --- old/xf86-video-nv-1.2.0/src/riva_driver.c 2006-06-17 02:48:53.000000000 +0200 +++ new/xf86-video-nv-1.2.1/src/riva_driver.c 2006-12-01 02:12:52.000000000 +0100 @@ -177,7 +177,7 @@ MODINFOSTRING1, MODINFOSTRING2, XORG_VERSION_CURRENT, - NV_MAJOR_VERSION, NV_MINOR_VERSION, NV_PATCHLEVEL, + PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL, ABI_CLASS_VIDEODRV, /* This is a video driver */ ABI_VIDEODRV_VERSION, MOD_CLASS_VIDEODRV, ++++++ xf86-video-s3-X11R7.1-0.4.1.tar.bz2 -> xf86-video-s3-0.5.0.tar.bz2 ++++++ ++++ 15241 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3-X11R7.1-0.4.1/compile new/xf86-video-s3-0.5.0/compile --- old/xf86-video-s3-X11R7.1-0.4.1/compile 1970-01-01 01:00:00.000000000 +0100 +++ new/xf86-video-s3-0.5.0/compile 2006-11-26 05:33:11.000000000 +0100 @@ -0,0 +1,142 @@ +#! /bin/sh +# Wrapper for compilers which do not understand `-c -o'. + +scriptversion=2005-05-14.22 + +# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. +# Written by Tom Tromey <tromey@cygnus.com>. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to <bug-automake@gnu.org> or send patches to +# <automake-patches@gnu.org>. + +case $1 in + '') + echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand `-c -o'. +Remove `-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file `INSTALL'. + +Report bugs to <bug-automake@gnu.org>. +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; +esac + +ofile= +cfile= +eat= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as `compile cc -o foo foo.c'. + # So we strip `-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no `-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # `.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'` + +# Create the lock directory. +# Note: use `[/.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3-X11R7.1-0.4.1/configure.ac new/xf86-video-s3-0.5.0/configure.ac --- old/xf86-video-s3-X11R7.1-0.4.1/configure.ac 2006-04-08 03:39:49.000000000 +0200 +++ new/xf86-video-s3-0.5.0/configure.ac 2006-11-27 20:14:01.000000000 +0100 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-s3], - 0.4.1, + 0.5.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-s3) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3-X11R7.1-0.4.1/src/Makefile.am new/xf86-video-s3-0.5.0/src/Makefile.am --- old/xf86-video-s3-X11R7.1-0.4.1/src/Makefile.am 2005-07-26 20:46:49.000000000 +0200 +++ new/xf86-video-s3-0.5.0/src/Makefile.am 2006-11-26 05:32:43.000000000 +0100 @@ -30,7 +30,6 @@ s3_drv_la_SOURCES = \ newmmio.h \ - s3_accel.c \ s3_bios.c \ s3_cursor.c \ s3_dga.c \ @@ -41,3 +40,12 @@ s3_Ti.c \ s3_Trio64DAC.c \ s3_video.c + +noinst_LTLIBRARIES = libs3_accel_newmmio.la libs3_accel_pio.la +s3_drv_la_LIBADD = libs3_accel_newmmio.la libs3_accel_pio.la + +libs3_accel_newmmio_la_SOURCES = s3_accel.c +libs3_accel_newmmio_la_CFLAGS = $(AM_CFLAGS) -DS3_NEWMMIO=1 + +libs3_accel_pio_la_SOURCES = s3_accel.c +libs3_accel_pio_la_CFLAGS = $(AM_CFLAGS) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3-X11R7.1-0.4.1/src/s3.h new/xf86-video-s3-0.5.0/src/s3.h --- old/xf86-video-s3-X11R7.1-0.4.1/src/s3.h 2006-04-08 03:39:50.000000000 +0200 +++ new/xf86-video-s3-0.5.0/src/s3.h 2006-11-27 20:19:07.000000000 +0100 @@ -164,10 +164,10 @@ #define DRIVER_NAME "s3" -#define DRIVER_VERSION "0.4.1" +#define DRIVER_VERSION "0.5.0" #define VERSION_MAJOR 0 -#define VERSION_MINOR 4 -#define PATCHLEVEL 1 +#define VERSION_MINOR 5 +#define PATCHLEVEL 0 #define S3_VERSION ((VERSION_MAJOR << 24) | \ (VERSION_MINOR << 16) | PATCHLEVEL) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3-X11R7.1-0.4.1/src/s3_accel.c new/xf86-video-s3-0.5.0/src/s3_accel.c --- old/xf86-video-s3-X11R7.1-0.4.1/src/s3_accel.c 2005-07-11 04:29:58.000000000 +0200 +++ new/xf86-video-s3-0.5.0/src/s3_accel.c 2006-09-02 20:01:40.000000000 +0200 @@ -24,7 +24,7 @@ * * */ -/* $XdotOrg: driver/xf86-video-s3/src/s3_accel.c,v 1.4 2005/07/11 02:29:58 ajax Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_accel.c,v 1.2 2004/04/23 19:43:14 eich Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_accel.c,v 1.2 2001/10/28 03:33:44 tsi Exp $ */ #ifdef HAVE_CONFIG_H diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3-X11R7.1-0.4.1/src/s3_reg.h new/xf86-video-s3-0.5.0/src/s3_reg.h --- old/xf86-video-s3-X11R7.1-0.4.1/src/s3_reg.h 2004-04-23 21:43:14.000000000 +0200 +++ new/xf86-video-s3-0.5.0/src/s3_reg.h 2006-09-02 20:01:40.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XFree86: $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_reg.h,v 1.1 2001/07/02 10:46:04 alanh Exp $ */ #ifndef _S3_REG_H #define _S3_REG_H ++++++ xf86-video-sis-0.9.2.tar.bz2 -> xf86-video-sis-0.9.3.tar.bz2 ++++++ ++++ 17266 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.2/configure.ac new/xf86-video-sis-0.9.3/configure.ac --- old/xf86-video-sis-0.9.2/configure.ac 2006-10-14 00:43:00.000000000 +0200 +++ new/xf86-video-sis-0.9.3/configure.ac 2006-11-30 18:58:10.000000000 +0100 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-sis], - 0.9.2, + 0.9.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-sis) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.2/src/sis_memcpy.c new/xf86-video-sis-0.9.3/src/sis_memcpy.c --- old/xf86-video-sis-0.9.2/src/sis_memcpy.c 2006-10-12 00:27:55.000000000 +0200 +++ new/xf86-video-sis-0.9.3/src/sis_memcpy.c 2006-11-30 15:10:11.000000000 +0100 @@ -31,6 +31,7 @@ #include "config.h" #endif +#include <stdlib.h> #include "sis.h" #if 0 /* Debug */ ++++++ xf86-video-tdfx-1.2.2.tar.bz2 -> xf86-video-tdfx-1.3.0.tar.bz2 ++++++ ++++ 16229 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-tdfx-1.2.2/configure.ac new/xf86-video-tdfx-1.3.0/configure.ac --- old/xf86-video-tdfx-1.2.2/configure.ac 2006-10-14 00:44:41.000000000 +0200 +++ new/xf86-video-tdfx-1.3.0/configure.ac 2006-11-22 18:14:51.000000000 +0100 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-tdfx], - 1.2.2, + 1.3.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-tdfx) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-tdfx-1.2.2/src/tdfx.h new/xf86-video-tdfx-1.3.0/src/tdfx.h --- old/xf86-video-tdfx-1.2.2/src/tdfx.h 2006-10-12 00:28:18.000000000 +0200 +++ new/xf86-video-tdfx-1.3.0/src/tdfx.h 2006-11-22 18:11:02.000000000 +0100 @@ -32,8 +32,8 @@ #define TDFX_NAME "TDFX" #define TDFX_DRIVER_NAME "tdfx" #define TDFX_MAJOR_VERSION 1 -#define TDFX_MINOR_VERSION 2 -#define TDFX_PATCHLEVEL 1 +#define TDFX_MINOR_VERSION 3 +#define TDFX_PATCHLEVEL 0 struct _TDFXRec; typedef struct _TDFXRec *TDFXPtr; @@ -229,6 +229,10 @@ XF86VideoAdaptorPtr textureAdaptor; ScreenBlockHandlerProcPtr BlockHandler; OptionInfoPtr Options; + + ScreenWakeupHandlerProcPtr coreWakeupHandler; + ScreenBlockHandlerProcPtr coreBlockHandler; + } TDFXRec; typedef struct { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-tdfx-1.2.2/src/tdfx_dri.c new/xf86-video-tdfx-1.3.0/src/tdfx_dri.c --- old/xf86-video-tdfx-1.2.2/src/tdfx_dri.c 2006-10-12 00:28:18.000000000 +0200 +++ new/xf86-video-tdfx-1.3.0/src/tdfx_dri.c 2006-11-22 17:42:50.000000000 +0100 @@ -249,6 +249,12 @@ { ScreenPtr pScreen = screenInfo.screens[screenNum]; ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + TDFXPtr pTDFX = TDFXPTR(pScrn); + + pTDFX->pDRIInfo->wrap.WakeupHandler = pTDFX->coreWakeupHandler; + (*pTDFX->pDRIInfo->wrap.WakeupHandler) (screenNum, wakeupData, result, pReadmask); + pTDFX->pDRIInfo->wrap.WakeupHandler = TDFXDoWakeupHandler; + TDFXNeedSync(pScrn); } @@ -259,8 +265,14 @@ { ScreenPtr pScreen = screenInfo.screens[screenNum]; ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + TDFXPtr pTDFX = TDFXPTR(pScrn); TDFXCheckSync(pScrn); + + pTDFX->pDRIInfo->wrap.BlockHandler = pTDFX->coreBlockHandler; + (*pTDFX->pDRIInfo->wrap.BlockHandler) (screenNum, blockData, pTimeout, pReadmask); + pTDFX->pDRIInfo->wrap.BlockHandler = TDFXDoBlockHandler; + } Bool TDFXDRIScreenInit(ScreenPtr pScreen) @@ -352,7 +364,9 @@ pDRIInfo->wrap.ValidateTree = 0; pDRIInfo->wrap.PostValidateTree = 0; + pTDFX->coreBlockHandler = pDRIInfo->wrap.BlockHandler; pDRIInfo->wrap.BlockHandler = TDFXDoBlockHandler; + pTDFX->coreWakeupHandler = pDRIInfo->wrap.WakeupHandler; pDRIInfo->wrap.WakeupHandler = TDFXDoWakeupHandler; if (SAREA_MAX_DRAWABLES < TDFX_MAX_DRAWABLES) ++++++ xf86-video-vesa-1.2.2.tar.bz2 -> xf86-video-vesa-1.3.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-vesa-1.2.2/configure new/xf86-video-vesa-1.3.0/configure --- old/xf86-video-vesa-1.2.2/configure 2006-10-14 00:47:49.000000000 +0200 +++ new/xf86-video-vesa-1.3.0/configure 2006-11-30 22:05:45.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for xf86-video-vesa 1.2.2. +# Generated by GNU Autoconf 2.59 for xf86-video-vesa 1.3.0. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -423,8 +423,8 @@ # Identity of this package. PACKAGE_NAME='xf86-video-vesa' PACKAGE_TARNAME='xf86-video-vesa' -PACKAGE_VERSION='1.2.2' -PACKAGE_STRING='xf86-video-vesa 1.2.2' +PACKAGE_VERSION='1.3.0' +PACKAGE_STRING='xf86-video-vesa 1.3.0' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_unique_file="Makefile.am" @@ -966,7 +966,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xf86-video-vesa 1.2.2 to adapt to many kinds of systems. +\`configure' configures xf86-video-vesa 1.3.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1032,7 +1032,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xf86-video-vesa 1.2.2:";; + short | recursive ) echo "Configuration of xf86-video-vesa 1.3.0:";; esac cat <<\_ACEOF @@ -1179,7 +1179,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -xf86-video-vesa configure 1.2.2 +xf86-video-vesa configure 1.3.0 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1193,7 +1193,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xf86-video-vesa $as_me 1.2.2, which was +It was created by xf86-video-vesa $as_me 1.3.0, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1841,7 +1841,7 @@ # Define the identity of the package. PACKAGE='xf86-video-vesa' - VERSION='1.2.2' + VERSION='1.3.0' cat >>confdefs.h <<_ACEOF @@ -20587,7 +20587,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by xf86-video-vesa $as_me 1.2.2, which was +This file was extended by xf86-video-vesa $as_me 1.3.0, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20650,7 +20650,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -xf86-video-vesa config.status 1.2.2 +xf86-video-vesa config.status 1.3.0 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-vesa-1.2.2/configure.ac new/xf86-video-vesa-1.3.0/configure.ac --- old/xf86-video-vesa-1.2.2/configure.ac 2006-10-14 00:47:39.000000000 +0200 +++ new/xf86-video-vesa-1.3.0/configure.ac 2006-11-30 22:04:10.000000000 +0100 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-vesa], - 1.2.2, + 1.3.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-vesa) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-vesa-1.2.2/src/vesa.c new/xf86-video-vesa-1.3.0/src/vesa.c --- old/xf86-video-vesa-1.2.2/src/vesa.c 2006-10-12 00:28:35.000000000 +0200 +++ new/xf86-video-vesa-1.3.0/src/vesa.c 2006-11-30 22:03:07.000000000 +0100 @@ -747,6 +747,23 @@ } static Bool +vesaCreateScreenResources(ScreenPtr pScreen) +{ + ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + VESAPtr pVesa = VESAGetRec(pScrn); + Bool ret; + + pScreen->CreateScreenResources = pVesa->CreateScreenResources; + ret = pScreen->CreateScreenResources(pScreen); + pScreen->CreateScreenResources = vesaCreateScreenResources; + + shadowAdd(pScreen, pScreen->GetScreenPixmap(pScreen), pVesa->update, + pVesa->window, 0, 0); + + return ret; +} + +static Bool VESAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) { ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; @@ -788,6 +805,16 @@ if (pVesa->shadowFB && pScrn->bitsPerPixel == 4) pScrn->bitsPerPixel = 8; + if (pVesa->shadowFB) { + pVesa->shadow = xcalloc(1, pScrn->displayWidth * pScrn->virtualY * + ((pScrn->bitsPerPixel + 7) / 8)); + if (!pVesa->shadow) { + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "Failed to allocate shadow buffer\n"); + return FALSE; + } + } + /* save current video state */ VESASaveRestore(pScrn, MODE_SAVE); pVesa->savedPal = VBESetGetPaletteData(pVesa->pVbe, FALSE, 0, 256, @@ -865,7 +892,7 @@ case 24: case 32: if (!fbScreenInit(pScreen, - pVesa->base, + pVesa->shadowFB ? pVesa->shadow : pVesa->base, pScrn->virtualX, pScrn->virtualY, pScrn->xDpi, pScrn->yDpi, pScrn->displayWidth, pScrn->bitsPerPixel)) @@ -901,27 +928,26 @@ fbPictureInit(pScreen, 0, 0); if (pVesa->shadowFB) { - ShadowUpdateProc update; - ShadowWindowProc window; - if (mode->MemoryModel == 3) { /* Planar */ if (pScrn->bitsPerPixel == 8) - update = shadowUpdatePlanar4x8Weak(); + pVesa->update = shadowUpdatePlanar4x8Weak(); else - update = shadowUpdatePlanar4Weak(); - window = VESAWindowPlanar; + pVesa->update = shadowUpdatePlanar4Weak(); + pVesa->window = VESAWindowPlanar; } else if (pVesa->mapPhys == 0xa0000) { /* Windowed */ - update = shadowUpdatePackedWeak(); - window = VESAWindowWindowed; + pVesa->update = shadowUpdatePackedWeak(); + pVesa->window = VESAWindowWindowed; } else { /* Linear */ - update = shadowUpdatePackedWeak(); - window = VESAWindowLinear; + pVesa->update = shadowUpdatePackedWeak(); + pVesa->window = VESAWindowLinear; } - if (!shadowInit(pScreen, update, window)) - return (FALSE); + if (!shadowSetup(pScreen)) + return FALSE; + pVesa->CreateScreenResources = pScreen->CreateScreenResources; + pScreen->CreateScreenResources = vesaCreateScreenResources; } else if (pVesa->mapPhys == 0xa0000 && mode->MemoryModel != 0x3) { unsigned int bankShift = 0; @@ -1005,6 +1031,8 @@ pVesa->savedPal, FALSE, TRUE); VESAUnmapVidMem(pScrn); } + if (pVesa->shadowFB && pVesa->shadow) + xfree(pVesa->shadow); if (pVesa->pDGAMode) { xfree(pVesa->pDGAMode); pVesa->pDGAMode = NULL; @@ -1012,6 +1040,7 @@ } pScrn->vtSema = FALSE; + pScreen->CreateScreenResources = pVesa->CreateScreenResources; pScreen->CloseScreen = pVesa->CloseScreen; return pScreen->CloseScreen(scrnIndex, pScreen); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-vesa-1.2.2/src/vesa.h new/xf86-video-vesa-1.3.0/src/vesa.h --- old/xf86-video-vesa-1.2.2/src/vesa.h 2006-10-12 00:28:35.000000000 +0200 +++ new/xf86-video-vesa-1.3.0/src/vesa.h 2006-11-30 22:04:02.000000000 +0100 @@ -83,7 +83,7 @@ #define VESA_NAME "VESA" #define VESA_DRIVER_NAME "vesa" #define VESA_MAJOR_VERSION 1 -#define VESA_MINOR_VERSION 2 +#define VESA_MINOR_VERSION 3 #define VESA_PATCHLEVEL 0 /*XXX*/ @@ -116,9 +116,13 @@ DGAModePtr pDGAMode; int nDGAMode; CloseScreenProcPtr CloseScreen; + CreateScreenResourcesProcPtr CreateScreenResources; OptionInfoPtr Options; IOADDRESS ioBase; Bool ModeSetClearScreen; + void *shadow; + ShadowUpdateProc update; + ShadowWindowProc window; } VESARec, *VESAPtr; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root＠suse.de