Hello community,
here is the log from the commit of package xorg-x11-driver-video for openSUSE:Factory
checked in at Thu Jul 9 00:01:28 CEST 2009.
--------
--- xorg-x11-driver-video/xorg-x11-driver-video.changes 2009-06-27 12:08:15.000000000 +0200
+++ xorg-x11-driver-video/xorg-x11-driver-video.changes 2009-07-04 22:47:49.000000000 +0200
@@ -1,0 +2,22 @@
+Sat Jul 4 22:41:42 CEST 2009 - sndirsch@suse.de
+
+- xf86-video-dummy 0.3.2
+- xf86-video-glint 1.2.3
+- xf86-video-i128 1.3.2
+- xf86-video-i740 1.3.1
+- xf86-video-neomagic 1.2.3
+- xf86-video-rendition 4.2.2
+- xf86-video-s3 0.6.2
+- xf86-video-s3virge 1.10.3
+- xf86-video-savage 2.3.0
+- xf86-video-siliconmotion 1.7.2
+- xf86-video-sisusb 0.9.2
+- xf86-video-tdfx 1.4.2
+- xf86-video-trident 1.3.2
+- xf86-video-tseng 1.2.2
+- xf86-video-voodoo 1.2.2
+- xf86-video-nv 2.1.14
+ * obsoletes xf86-video-nv-2.1.13_68c2914.diff,
+ xf86-video-nv-68c2914_05d2b85.diff
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
xf86-video-dummy-0.3.1.tar.bz2
xf86-video-glint-1.2.2.tar.bz2
xf86-video-i128-1.3.1.tar.bz2
xf86-video-i740-1.3.0.tar.bz2
xf86-video-neomagic-1.2.2.tar.bz2
xf86-video-nv-2.1.13.tar.bz2
xf86-video-nv-2.1.13_68c2914.diff
xf86-video-nv-68c2914_05d2b85.diff
xf86-video-rendition-4.2.1.tar.bz2
xf86-video-s3-0.6.1.tar.bz2
xf86-video-s3virge-1.10.2.tar.bz2
xf86-video-savage-2.2.1.tar.bz2
xf86-video-siliconmotion-1.7.1.tar.bz2
xf86-video-sisusb-0.9.1.tar.bz2
xf86-video-tdfx-1.4.1.tar.bz2
xf86-video-trident-1.3.1.tar.bz2
xf86-video-tseng-1.2.1.tar.bz2
xf86-video-voodoo-1.2.1.tar.bz2
New:
----
xf86-video-dummy-0.3.2.tar.bz2
xf86-video-glint-1.2.3.tar.bz2
xf86-video-i128-1.3.2.tar.bz2
xf86-video-i740-1.3.1.tar.bz2
xf86-video-neomagic-1.2.3.tar.bz2
xf86-video-nv-2.1.14.tar.bz2
xf86-video-rendition-4.2.2.tar.bz2
xf86-video-s3-0.6.2.tar.bz2
xf86-video-s3virge-1.10.3.tar.bz2
xf86-video-savage-2.3.0.tar.bz2
xf86-video-siliconmotion-1.7.2.tar.bz2
xf86-video-sisusb-0.9.2.tar.bz2
xf86-video-tdfx-1.4.2.tar.bz2
xf86-video-trident-1.3.2.tar.bz2
xf86-video-tseng-1.2.2.tar.bz2
xf86-video-voodoo-1.2.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-video.spec ++++++
--- /var/tmp/diff_new_pack.0EgKud/_old 2009-07-09 00:00:23.000000000 +0200
+++ /var/tmp/diff_new_pack.0EgKud/_new 2009-07-09 00:00:23.000000000 +0200
@@ -23,7 +23,7 @@
BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk
Url: http://xorg.freedesktop.org/
Version: 7.4
-Release: 68
+Release: 69
License: MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -40,32 +40,32 @@
Source2: xf86-video-ast-0.88.8.tar.bz2
Source4: xf86-video-chips-1.2.1.tar.bz2
Source5: xf86-video-cirrus-1.2.1.tar.bz2
-Source7: xf86-video-dummy-0.3.1.tar.bz2
+Source7: xf86-video-dummy-0.3.2.tar.bz2
Source8: xf86-video-fbdev-0.4.0.tar.bz2
-Source9: xf86-video-glint-1.2.2.tar.bz2
-Source10: xf86-video-i128-1.3.1.tar.bz2
-Source11: xf86-video-i740-1.3.0.tar.bz2
+Source9: xf86-video-glint-1.2.3.tar.bz2
+Source10: xf86-video-i128-1.3.2.tar.bz2
+Source11: xf86-video-i740-1.3.1.tar.bz2
Source14: xf86-video-mga-1.4.10.tar.bz2
-Source15: xf86-video-neomagic-1.2.2.tar.bz2
+Source15: xf86-video-neomagic-1.2.3.tar.bz2
Source16: xf86-video-newport-0.2.2.tar.bz2
Source17: xf86-video-nsc-2.8.3.tar.bz2
-Source18: xf86-video-nv-2.1.13.tar.bz2
-Source19: xf86-video-rendition-4.2.1.tar.bz2
-Source20: xf86-video-s3-0.6.1.tar.bz2
-Source21: xf86-video-s3virge-1.10.2.tar.bz2
-Source22: xf86-video-savage-2.2.1.tar.bz2
-Source23: xf86-video-siliconmotion-1.7.1.tar.bz2
+Source18: xf86-video-nv-2.1.14.tar.bz2
+Source19: xf86-video-rendition-4.2.2.tar.bz2
+Source20: xf86-video-s3-0.6.2.tar.bz2
+Source21: xf86-video-s3virge-1.10.3.tar.bz2
+Source22: xf86-video-savage-2.3.0.tar.bz2
+Source23: xf86-video-siliconmotion-1.7.2.tar.bz2
Source24: xf86-video-sis-0.10.1.tar.bz2
-Source25: xf86-video-sisusb-0.9.1.tar.bz2
-Source33: xf86-video-tdfx-1.4.1.tar.bz2
+Source25: xf86-video-sisusb-0.9.2.tar.bz2
+Source33: xf86-video-tdfx-1.4.2.tar.bz2
Source34: xf86-video-tga-1.2.0.tar.bz2
-Source35: xf86-video-trident-1.3.1.tar.bz2
-Source36: xf86-video-tseng-1.2.1.tar.bz2
+Source35: xf86-video-trident-1.3.2.tar.bz2
+Source36: xf86-video-tseng-1.2.2.tar.bz2
Source37: xf86-video-v4l-0.2.0.tar.bz2
Source38: xf86-video-vesa-2.2.0.tar.bz2
Source39: xf86-video-vga-4.1.0_080718_97e2d12.tar.bz2
Source41: xf86-video-vmware-10.16.6.tar.bz2
-Source42: xf86-video-voodoo-1.2.1.tar.bz2
+Source42: xf86-video-voodoo-1.2.2.tar.bz2
Source43: xf86-video-impact-0.2.0.tar.bz2
Source44: HALlib-4.1.tar.gz
Source45: xf86-video-intel-2.7.1.tar.bz2
@@ -78,8 +78,6 @@
Source55: xf86-video-r128-6.8.0.tar.bz2
Source56: intel-gpu-tools-1.0.1.tar.bz2
Source100: sax2-hwinfo-data.tar.gz
-Patch4: xf86-video-nv-2.1.13_68c2914.diff
-Patch5: xf86-video-nv-68c2914_05d2b85.diff
Patch10: xf86-video-tdfx.diff
Patch12: xf86-video-mga-hal.diff
Patch14: xf86-video-rendition.diff
@@ -134,10 +132,6 @@
%patch62 -p1
%patch67 -p1
popd
-pushd xf86-video-nv-*
-%patch4 -p1
-%patch5 -p1
-popd
pushd xf86-video-mga-1.4.10
tar xzf %{SOURCE44} -C src
%ifarch %ix86
++++++ xf86-video-dummy-0.3.1.tar.bz2 -> xf86-video-dummy-0.3.2.tar.bz2 ++++++
++++ 55587 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-dummy-0.3.1/README new/xf86-video-dummy-0.3.2/README
--- old/xf86-video-dummy-0.3.1/README 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86-video-dummy-0.3.2/README 2009-05-27 23:31:07.000000000 +0200
@@ -0,0 +1,20 @@
+xf86-video-dummy - virtual/offscreen frame buffer driver for the Xorg X server
+
+Please submit bugs & patches to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/driver/xf86-video-dummy
+
+ http://cgit.freedesktop.org/xorg/driver/xf86-video-dummy
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
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-dummy-0.3.1/config.h.in new/xf86-video-dummy-0.3.2/config.h.in
--- old/xf86-video-dummy-0.3.1/config.h.in 2009-01-25 23:26:11.000000000 +0100
+++ new/xf86-video-dummy-0.3.2/config.h.in 2009-07-02 17:08:08.000000000 +0200
@@ -32,6 +32,10 @@
/* Define to 1 if you have the header file. */
#undef HAVE_UNISTD_H
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
/* Name of package */
#undef PACKAGE
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-dummy-0.3.1/configure.ac new/xf86-video-dummy-0.3.2/configure.ac
--- old/xf86-video-dummy-0.3.1/configure.ac 2009-01-25 23:23:57.000000000 +0100
+++ new/xf86-video-dummy-0.3.2/configure.ac 2009-07-02 17:07:44.000000000 +0200
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-dummy],
- 0.3.1,
+ 0.3.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-dummy)
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-dummy-0.3.1/src/dummy_driver.c new/xf86-video-dummy-0.3.2/src/dummy_driver.c
--- old/xf86-video-dummy-0.3.1/src/dummy_driver.c 2009-01-25 23:21:56.000000000 +0100
+++ new/xf86-video-dummy-0.3.2/src/dummy_driver.c 2009-05-28 20:21:05.000000000 +0200
@@ -125,30 +125,6 @@
{ -1, NULL, OPTV_NONE, {0}, FALSE }
};
-
-/*
- * List of symbols from other modules that this module references. This
- * list is used to tell the loader that it is OK for symbols here to be
- * unresolved providing that it hasn't been told that they haven't been
- * told that they are essential via a call to xf86LoaderReqSymbols() or
- * xf86LoaderReqSymLists(). The purpose is this is to avoid warnings about
- * unresolved symbols that are not required.
- */
-
-static const char *fbSymbols[] = {
- "fbPictureInit",
- "fbScreenInit",
- NULL
-};
-
-static const char *ramdacSymbols[] = {
- "xf86CreateCursorInfoRec",
- "xf86DestroyCursorInfoRec",
- "xf86InitCursor",
- NULL
-};
-
-
#ifdef XFree86LOADER
static MODULESETUPPROTO(dummySetup);
@@ -188,11 +164,6 @@
*/
/*
- * Tell the loader about symbols from other modules that this module
- * might refer to.
- */
- LoaderRefSymLists(fbSymbols, ramdacSymbols, NULL);
- /*
* The return value must be non-NULL on success even though there
* is no TearDownProc.
*/
@@ -470,12 +441,10 @@
if (xf86LoadSubModule(pScrn, "fb") == NULL) {
RETURN;
}
- xf86LoaderReqSymLists(fbSymbols, NULL);
if (!dPtr->swCursor) {
if (!xf86LoadSubModule(pScrn, "ramdac"))
RETURN;
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
/* We have no contiguous physical fb in physical memory */
++++++ xf86-video-glint-1.2.2.tar.bz2 -> xf86-video-glint-1.2.3.tar.bz2 ++++++
++++ 56031 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-glint-1.2.2/README new/xf86-video-glint-1.2.3/README
--- old/xf86-video-glint-1.2.2/README 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86-video-glint-1.2.3/README 2009-05-27 23:31:14.000000000 +0200
@@ -0,0 +1,20 @@
+xf86-video-glint - GLINT/Permedia video driver for the Xorg X server
+
+Please submit bugs & patches to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/driver/xf86-video-glint
+
+ http://cgit.freedesktop.org/xorg/driver/xf86-video-glint
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
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-glint-1.2.2/config.h.in new/xf86-video-glint-1.2.3/config.h.in
--- old/xf86-video-glint-1.2.2/config.h.in 2008-12-22 05:32:33.000000000 +0100
+++ new/xf86-video-glint-1.2.3/config.h.in 2009-07-02 17:11:21.000000000 +0200
@@ -35,6 +35,10 @@
/* Define to 1 if you have the header file. */
#undef HAVE_UNISTD_H
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
/* Name of package */
#undef PACKAGE
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-glint-1.2.2/configure.ac new/xf86-video-glint-1.2.3/configure.ac
--- old/xf86-video-glint-1.2.2/configure.ac 2008-12-22 05:32:17.000000000 +0100
+++ new/xf86-video-glint-1.2.3/configure.ac 2009-07-02 17:10:56.000000000 +0200
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-glint],
- 1.2.2,
+ 1.2.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-glint)
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-glint-1.2.2/man/glint.man new/xf86-video-glint-1.2.3/man/glint.man
--- old/xf86-video-glint-1.2.2/man/glint.man 2008-03-03 01:02:30.000000000 +0100
+++ new/xf86-video-glint-1.2.3/man/glint.man 2009-05-27 23:31:14.000000000 +0200
@@ -104,7 +104,7 @@
If you have a card of the same name, turn this on. Default: off.
.TP
.SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
.SH AUTHORS
Authors include: Alan Hourihane, Dirk Hohndel, Stefan Dirsch, Michel Dänzer,
Sven Luther
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-glint-1.2.2/src/Makefile.am new/xf86-video-glint-1.2.3/src/Makefile.am
--- old/xf86-video-glint-1.2.2/src/Makefile.am 2008-12-22 05:31:59.000000000 +0100
+++ new/xf86-video-glint-1.2.3/src/Makefile.am 2009-07-02 17:10:19.000000000 +0200
@@ -23,7 +23,7 @@
# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@
+AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -DPPC_MMIO_IS_BE -DSPARC_MMIO_IS_BE
glint_drv_la_LTLIBRARIES = glint_drv.la
glint_drv_la_LDFLAGS = -module -avoid-version
glint_drv_ladir = @moduledir@/drivers
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-glint-1.2.2/src/glint.h new/xf86-video-glint-1.2.3/src/glint.h
--- old/xf86-video-glint-1.2.2/src/glint.h 2008-03-03 01:02:30.000000000 +0100
+++ new/xf86-video-glint-1.2.3/src/glint.h 2009-05-28 20:26:36.000000000 +0200
@@ -343,7 +343,6 @@
void GLINTAdjustFrame(int scrnIndex, int x, int y, int flags);
extern int partprodPermedia[];
-extern const char *GLINTint10Symbols[];
Bool GLINTDGAInit(ScreenPtr pScreen);
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-glint-1.2.2/src/glint_driver.c new/xf86-video-glint-1.2.3/src/glint_driver.c
--- old/xf86-video-glint-1.2.2/src/glint_driver.c 2008-12-22 05:31:59.000000000 +0100
+++ new/xf86-video-glint-1.2.3/src/glint_driver.c 2009-07-02 17:10:19.000000000 +0200
@@ -229,158 +229,7 @@
{ -1 }
};
-static const char *xf8_32bppSymbols[] = {
- "cfb8_32ScreenInit",
- "xf86Overlay8Plus32Init",
- NULL
-};
-
-static const char *xaaSymbols[] = {
- "XAACreateInfoRec",
- "XAADestroyInfoRec",
- "XAAInit",
- "XAAPolyLines",
- "XAAPolySegment",
- NULL
-};
-
-static const char *fbSymbols[] = {
- "fbBres",
- "fbPictureInit",
- "fbScreenInit",
- NULL
-};
-
-static const char *ddcSymbols[] = {
- "xf86PrintEDID",
- "xf86DoEDID_DDC2",
- "xf86SetDDCproperties",
- NULL
-};
-
-static const char *i2cSymbols[] = {
- "xf86CreateI2CBusRec",
- "xf86DestroyI2CBusRec",
- "xf86DestroyI2CDevRec",
- "xf86I2CBusInit",
- "xf86I2CDevInit",
- "xf86I2CProbeAddress",
- "xf86I2CWriteByte",
- "xf86I2CWriteVec",
- NULL
-};
-
-static const char *shadowSymbols[] = {
- "ShadowFBInit",
- NULL
-};
-
#ifdef XFree86LOADER
-static const char *vbeSymbols[] = {
- "VBEInit",
- "vbeDoEDID",
- "vbeFree",
- NULL
-};
-#endif
-
-static const char *ramdacSymbols[] = {
- "IBMramdac526CalculateMNPCForClock",
- "IBMramdac640CalculateMNPCForClock",
- "IBMramdacProbe",
- "RamDacCreateInfoRec",
- "RamDacDestroyInfoRec",
- "RamDacFreeRec",
- "RamDacGetHWIndex",
- "RamDacHandleColormaps",
- "RamDacInit",
- "TIramdacCalculateMNPForClock",
- "TIramdacLoadPalette",
- "TIramdacLoadPaletteWeak",
- "TIramdacProbe",
- "xf86CreateCursorInfoRec",
- "xf86DestroyCursorInfoRec",
- "xf86InitCursor",
- NULL
-};
-
-
-static const char *fbdevHWSymbols[] = {
- "fbdevHWFreeRec",
- "fbdevHWInit",
- "fbdevHWProbe",
- "fbdevHWUseBuildinMode",
-
- "fbdevHWGetDepth",
- "fbdevHWGetVidmem",
-
- /* colormap */
- "fbdevHWLoadPaletteWeak",
-
- /* ScrnInfo hooks */
- "fbdevHWAdjustFrameWeak",
- "fbdevHWEnterVT",
- "fbdevHWLeaveVTWeak",
- "fbdevHWMapMMIO",
- "fbdevHWMapVidmem",
- "fbdevHWModeInit",
- "fbdevHWRestore",
- "fbdevHWSave",
- "fbdevHWSwitchMode",
- "fbdevHWUnmapMMIO",
- "fbdevHWUnmapVidmem",
- "fbdevHWValidModeWeak",
-
- NULL
-};
-
-const char *GLINTint10Symbols[] = {
- "xf86FreeInt10",
- "xf86InitInt10",
- NULL
-};
-
-#ifdef XFree86LOADER
-
-#ifdef XF86DRI_DEVEL
-static const char *drmSymbols[] = {
- "drmAddBufs",
- "drmAddMap",
- "drmAgpAcquire",
- "drmAgpAlloc",
- "drmAgpBind",
- "drmAgpEnable",
- "drmAgpFree",
- "drmAgpGetMode",
- "drmAgpRelease",
- "drmAgpUnbind",
- "drmCommandWrite",
- "drmCtlInstHandler",
- "drmFreeBufs",
- "drmFreeVersion",
- "drmGetInterruptFromBusID",
- "drmGetLibVersion",
- "drmGetVersion",
- "drmMap",
- "drmMapBufs",
- "drmUnmap",
- "drmUnmapBufs",
- NULL
-};
-
-static const char *driSymbols[] = {
- "DRICloseScreen",
- "DRICreateInfoRec",
- "DRIDestroyInfoRec",
- "DRIFinishScreenInit",
- "DRIGetDrawableIndex",
- "DRIQueryVersion",
- "DRIScreenInit",
- "GlxSetVisualConfigs",
- "DRICreatePCIBusID",
- NULL
-};
-#endif
static MODULESETUPPROTO(glintSetup);
@@ -408,14 +257,6 @@
if (!setupDone) {
setupDone = TRUE;
xf86AddDriver(&GLINT, module, 0);
- LoaderRefSymLists(fbSymbols, ddcSymbols, i2cSymbols,
- xaaSymbols, xf8_32bppSymbols,
- shadowSymbols, fbdevHWSymbols, GLINTint10Symbols,
- vbeSymbols, ramdacSymbols,
-#ifdef XF86DRI_DEVEL
- drmSymbols, driSymbols,
-#endif
- NULL);
return (pointer)TRUE;
}
@@ -663,8 +504,6 @@
if (!xf86LoadDrvSubModule(drv, "fbdevhw"))
return FALSE;
- xf86LoaderReqSymLists(fbdevHWSymbols, NULL);
-
for (i = 0; i < numDevSections; i++) {
dev = xf86FindOptionValue(devSections[i]->options,"fbdev");
if (devSections[i]->busID) {
@@ -986,7 +825,6 @@
ClockRangePtr clockRanges;
char *mod = NULL;
const char *s;
- const char **syms = NULL;
TRACE_ENTER("GLINTPreInit");
@@ -1101,7 +939,6 @@
pScrn->monitor = pScrn->confScreen->monitor;
/*
* The first thing we should figure out is the depth, bpp, etc.
- * Our default depth is 8, so pass it to the helper function.
* We support both 24bpp and 32bpp layouts, so indicate that.
*/
if (FBDevProbed) {
@@ -1115,7 +952,7 @@
if (!xf86SetDepthBpp(pScrn, default_depth, default_depth, fbbpp,0))
return FALSE;
} else {
- if (!xf86SetDepthBpp(pScrn, 8, 0, 0, Support24bppFb | Support32bppFb
+ if (!xf86SetDepthBpp(pScrn, 0, 0, 0, Support24bppFb | Support32bppFb
/*| SupportConvert32to24 | PreferConvert32to24*/))
return FALSE;
}
@@ -1239,8 +1076,6 @@
return FALSE;
}
- xf86LoaderReqSymLists(fbdevHWSymbols, NULL);
-
if (!fbdevHWInit(pScrn,NULL,xf86FindOptionValue(pGlint->pEnt->device->options,"fbdev")))
{
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "fbdevHWInit failed!\n");
@@ -1438,6 +1273,7 @@
}
}
+#if !defined(__sparc__)
/* Initialize the card through int10 interface if needed */
if (pGlint->Chipset != PCI_VENDOR_3DLABS_CHIP_GAMMA &&
pGlint->Chipset != PCI_VENDOR_3DLABS_CHIP_GAMMA2 &&
@@ -1446,12 +1282,12 @@
if ( xf86LoadSubModule(pScrn, "int10")){
xf86Int10InfoPtr pInt;
- xf86LoaderReqSymLists(GLINTint10Symbols, NULL);
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Initializing int10\n");
pInt = xf86InitInt10(pGlint->pEnt->index);
xf86FreeInt10(pInt);
}
}
+#endif
pGlint->FbMapSize = 0;
@@ -1677,8 +1513,6 @@
if (!xf86LoadSubModule(pScrn, "ramdac"))
return FALSE;
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
-
/* Let's check what type of DAC we have and reject if necessary */
switch (pGlint->Chipset) {
case PCI_VENDOR_TI_CHIP_PERMEDIA2:
@@ -2054,7 +1888,6 @@
GLINTFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(ddcSymbols, NULL);
/* Load I2C if needed */
if ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_PERMEDIA2) ||
(pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_PERMEDIA2V) ||
@@ -2065,7 +1898,6 @@
if (xf86LoadSubModule(pScrn, "i2c")) {
I2CBusPtr pBus;
- xf86LoaderReqSymLists(i2cSymbols, NULL);
if ((pBus = xf86CreateI2CBusRec())) {
pBus->BusName = "DDC";
pBus->scrnIndex = pScrn->scrnIndex;
@@ -2098,9 +1930,12 @@
{
xf86MonPtr pMon = NULL;
- if (pGlint->DDCBus)
+ if (pGlint->DDCBus) {
+ GLINTMapMem(pScrn);
pMon = xf86DoEDID_DDC2(pScrn->scrnIndex, pGlint->DDCBus);
-
+ GLINTUnmapMem(pScrn);
+ }
+
if (!pMon)
/* Try DDC1 */;
@@ -2395,15 +2230,12 @@
case 16:
case 24:
mod = "fb";
- syms = fbSymbols;
break;
case 32:
if (pScrn->overlayFlags & OVERLAY_8_32_PLANAR) {
mod = "xf8_32bpp";
- syms = xf8_32bppSymbols;
} else {
mod = "fb";
- syms = fbSymbols;
}
break;
}
@@ -2411,9 +2243,6 @@
GLINTFreeRec(pScrn);
return FALSE;
}
- if (mod && syms) {
- xf86LoaderReqSymLists(syms, NULL);
- }
/* Load XAA if needed */
if (!pGlint->NoAccel) {
@@ -2421,7 +2250,6 @@
GLINTFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(xaaSymbols, NULL);
}
/* Load shadowfb if needed */
@@ -2430,7 +2258,6 @@
GLINTFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(shadowSymbols, NULL);
}
TRACE_EXIT("GLINTPreInit");
@@ -2469,13 +2296,13 @@
*/
#ifndef XSERVER_LIBPCIACCESS
pGlint->IOBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO_32BIT,
- pGlint->PciTag, pGlint->IOAddress, 0x20000);
+ pGlint->PciTag, pGlint->IOAddress, 0x10000);
#else
{
void** result = (void**)&pGlint->IOBase;
int err = pci_device_map_range(pGlint->PciInfo,
pGlint->IOAddress,
- 0x20000,
+ 0x10000,
PCI_DEV_MAP_FLAG_WRITABLE,
result);
@@ -2543,9 +2370,9 @@
* Unmap IO registers to virtual address space
*/
#ifndef XSERVER_LIBPCIACCESS
- xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pGlint->IOBase, 0x20000);
+ xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pGlint->IOBase, 0x10000);
#else
- pci_device_unmap_range(pGlint->PciInfo, pGlint->IOBase, 0x20000);
+ pci_device_unmap_range(pGlint->PciInfo, pGlint->IOBase, 0x10000);
#endif
pGlint->IOBase = NULL;
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-glint-1.2.2/src/pm3_dac.c new/xf86-video-glint-1.2.3/src/pm3_dac.c
--- old/xf86-video-glint-1.2.2/src/pm3_dac.c 2008-12-22 05:31:59.000000000 +0100
+++ new/xf86-video-glint-1.2.3/src/pm3_dac.c 2009-05-28 00:01:06.000000000 +0200
@@ -445,7 +445,6 @@
if (xf86LoadSubModule(pScrn, "int10")) {
xf86Int10InfoPtr pInt;
- xf86LoaderReqSymLists(GLINTint10Symbols, NULL);
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Initializing int10\n");
pInt = xf86InitInt10(pGlint->pEnt->index);
xf86FreeInt10(pInt);
++++++ xf86-video-i128-1.3.1.tar.bz2 -> xf86-video-i128-1.3.2.tar.bz2 ++++++
++++ 57163 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-i128-1.3.1/config.h.in new/xf86-video-i128-1.3.2/config.h.in
--- old/xf86-video-i128-1.3.1/config.h.in 2008-09-04 19:53:17.000000000 +0200
+++ new/xf86-video-i128-1.3.2/config.h.in 2009-07-02 17:16:37.000000000 +0200
@@ -2,6 +2,9 @@
#include "xorg-server.h"
+/* Major version of EXA we can handle */
+#undef EXA_DRIVER_KNOWN_MAJOR
+
/* Define to 1 if you have the header file. */
#undef HAVE_DLFCN_H
@@ -38,6 +41,10 @@
/* Have 4bpp support */
#undef HAVE_XF4BPP
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
/* Name of package */
#undef PACKAGE
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-i128-1.3.1/configure.ac new/xf86-video-i128-1.3.2/configure.ac
--- old/xf86-video-i128-1.3.1/configure.ac 2008-09-04 19:51:53.000000000 +0200
+++ new/xf86-video-i128-1.3.2/configure.ac 2009-07-02 17:16:13.000000000 +0200
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-i128],
- 1.3.1,
+ 1.3.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-i128)
@@ -73,6 +73,9 @@
fi
AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
+# Required by exa.h
+AC_DEFINE(EXA_DRIVER_KNOWN_MAJOR, 3, [Major version of EXA we can handle])
+
# Checks for header files.
AC_HEADER_STDC
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-i128-1.3.1/man/i128.man new/xf86-video-i128-1.3.2/man/i128.man
--- old/xf86-video-i128-1.3.1/man/i128.man 2007-05-02 14:21:04.000000000 +0200
+++ new/xf86-video-i128-1.3.2/man/i128.man 2009-02-04 23:27:04.000000000 +0100
@@ -65,6 +65,6 @@
This turns on verbose debug information from the driver.
Default: off.
.SH "SEE ALSO"
-__xservername__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(1), __xconfigfile__(__filemansuffix__), Xserver(1), X(__miscmansuffix__)
.SH AUTHORS
Authors include: Robin Cutshaw (driver), Galen Brooks (flatpanel support).
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-i128-1.3.1/src/i128IBMDAC.c new/xf86-video-i128-1.3.2/src/i128IBMDAC.c
--- old/xf86-video-i128-1.3.1/src/i128IBMDAC.c 2008-09-04 19:51:28.000000000 +0200
+++ new/xf86-video-i128-1.3.2/src/i128IBMDAC.c 2009-07-02 17:15:49.000000000 +0200
@@ -43,8 +43,6 @@
static void I128IBMSetCursorPosition(ScrnInfoPtr pScrn, int x, int y);
static void I128IBMSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg);
static void I128IBMLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src);
-static unsigned char *I128IBMRealizeCursor(xf86CursorInfoPtr infoPtr,
- CursorPtr pCurs);
static Bool I128IBMUseHWCursor(ScreenPtr pScrn, CursorPtr pCurs);
@@ -73,86 +71,12 @@
infoPtr->Flags = HARDWARE_CURSOR_TRUECOLOR_AT_8BPP |
HARDWARE_CURSOR_AND_SOURCE_WITH_MASK |
HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_1;
- infoPtr->RealizeCursor = I128IBMRealizeCursor;
-
- return(xf86InitCursor(pScreen, infoPtr));
-}
+#if X_BYTE_ORDER == X_BIG_ENDIAN
+ infoPtr->Flags |= HARDWARE_CURSOR_NIBBLE_SWAPPED;
+#endif
-/*
- * Convert the cursor from server-format to hardware-format. The IBMRGB
- * has two planes, plane 0 selects cursor color 0 or 1 and plane 1
- * selects transparent or display cursor. The bits of these planes
- * are packed together so that one byte has 4 pixels. The organization
- * looks like:
- * Byte 0x000 - 0x00F top scan line, left to right
- * 0x010 - 0x01F
- * . .
- * 0x3F0 - 0x3FF bottom scan line
- *
- * Byte/bit map - D7D6,D5D4,D3D2,D1D0 four pixels, two planes each
- * Pixel/bit map - P1P0 (plane 1) == 1 maps to cursor color
- * (plane 1) == 0 maps to transparent
- * (plane 0) maps to cursor colors 0 and 1
- */
-
-static unsigned char *
-I128IBMRealizeCursor(xf86CursorInfoPtr infoPtr, CursorPtr pCurs)
-{
- register int i, j;
- unsigned char *pServMsk;
- unsigned char *pServSrc;
- int wsrc, h;
- unsigned char *mem, *dst;
-
- mem = (unsigned char *)xcalloc(1,1024); /* 64x64x2 bits */
- dst = mem;
-
- if (!mem)
- return NULL;
-
- pServSrc = (unsigned char *)pCurs->bits->source;
- pServMsk = (unsigned char *)pCurs->bits->mask;
-
- h = pCurs->bits->height;
- if (h > infoPtr->MaxHeight)
- h = infoPtr->MaxHeight;
-
- wsrc = PixmapBytePad(pCurs->bits->width, 1); /* bytes per line */
-
- for (i = 0; i < infoPtr->MaxHeight; i++,mem+=16) {
- for (j = 0; j < infoPtr->MaxWidth / 8; j++) {
- register unsigned char mask, source;
-
- if (i < h && j < wsrc) {
- /*
- * mask byte ABCDEFGH and source byte 12345678 map to two byte
- * cursor data H8G7F6E5 D4C3B2A1
- */
- mask = *pServMsk++;
- source = *pServSrc++ & mask;
-
- /* map 1 byte source and mask into two byte cursor data */
- mem[j*2] = ((mask&0x01) << 7) | ((source&0x01) << 6) |
- ((mask&0x02) << 4) | ((source&0x02) << 3) |
- ((mask&0x04) << 1) | (source&0x04) |
- ((mask&0x08) >> 2) | ((source&0x08) >> 3) ;
- mem[(j*2)+1] = ((mask&0x10) << 3) | ((source&0x10) << 2) |
- (mask&0x20) | ((source&0x20) >> 1) |
- ((mask&0x40) >> 3) | ((source&0x40) >> 4) |
- ((mask&0x80) >> 6) | ((source&0x80) >> 7) ;
- } else {
- mem[j*2] = 0x00;
- mem[(j*2)+1] = 0x00;
- }
- }
- /*
- * if we still have more bytes on this line (j < wsrc),
- * we have to ignore the rest of the line.
- */
- while (j++ < wsrc) pServMsk++,pServSrc++;
- }
- return dst;
+ return(xf86InitCursor(pScreen, infoPtr));
}
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-i128-1.3.1/src/i128_driver.c new/xf86-video-i128-1.3.2/src/i128_driver.c
--- old/xf86-video-i128-1.3.1/src/i128_driver.c 2008-09-04 19:51:28.000000000 +0200
+++ new/xf86-video-i128-1.3.2/src/i128_driver.c 2009-05-28 20:59:20.000000000 +0200
@@ -166,87 +166,6 @@
#endif
-
-/*
- * List of symbols from other modules that this module references. This
- * list is used to tell the loader that it is OK for symbols here to be
- * unresolved providing that it hasn't been told that they haven't been
- * told that they are essential via a call to xf86LoaderReqSymbols() or
- * xf86LoaderReqSymLists(). The purpose is this is to avoid warnings about
- * unresolved symbols that are not required. These are provided to the
- * LoaderRefSymLists() function in the module specific Setup() function.
- */
-
-static const char *vgahwSymbols[] = {
- "vgaHWFreeHWRec",
- "vgaHWGetHWRec",
- "vgaHWGetIOBase",
- "vgaHWGetIndex",
- "vgaHWProtect",
- "vgaHWRestore",
- "vgaHWSave",
- NULL
-};
-
-static const char *fbSymbols[] = {
- "fbScreenInit",
- "fbPictureInit",
- NULL
-};
-
-static const char *exaSymbols[] = {
- "exaDriverAlloc",
- "exaDriverInit",
- "exaDriverFini",
- "exaGetPixmapOffset",
- NULL
-};
-
-static const char *xaaSymbols[] = {
- "XAACreateInfoRec",
- "XAADestroyInfoRec",
- "XAAInit",
- NULL
-};
-
-static const char *ramdacSymbols[] = {
- "xf86CreateCursorInfoRec",
- "xf86DestroyCursorInfoRec",
- "xf86InitCursor",
- NULL
-};
-
-static const char *ddcSymbols[] = {
- "xf86DoEDID_DDC1",
- "xf86DoEDID_DDC2",
- "xf86PrintEDID",
- "xf86SetDDCproperties",
- NULL
-};
-
-static const char *i2cSymbols[] = {
- "xf86CreateI2CBusRec",
- "xf86I2CBusInit",
- NULL
-};
-
-#ifdef XFree86LOADER
-/* XXX The vbe module isn't currently loaded. */
-static const char *vbeSymbols[] = {
- "VBEInit",
- "vbeDoEDID",
- NULL
-};
-
-/* XXX The int10 module isn't currently loaded. */
-static const char *int10Symbols[] = {
- "xf86InitInt10",
- "xf86FreeInt10",
- NULL
-};
-#endif
-
-
#ifdef XFree86LOADER
/* Mandatory
@@ -283,22 +202,6 @@
*/
/*
- * Tell the loader about symbols from other modules that this module
- * might refer to.
- */
- LoaderRefSymLists(fbSymbols,
- exaSymbols,
- xaaSymbols,
- ramdacSymbols,
- ddcSymbols,
- ddcSymbols,
- i2cSymbols,
- vbeSymbols,
- int10Symbols,
- vgahwSymbols,
- NULL);
-
- /*
* The return value must be non-NULL on success even though there
* is no TearDownProc.
*/
@@ -580,8 +483,6 @@
if (!xf86LoadSubModule(pScrn, "vgahw"))
return FALSE;
- xf86LoaderReqSymLists(vgahwSymbols, NULL);
-
/*
* Allocate a vgaHWRec
*/
@@ -874,9 +775,7 @@
/* Load DDC if we have the code to use it */
/* This gives us DDC1 */
if (pI128->ddc1Read || pI128->i2cInit) {
- if (xf86LoadSubModule(pScrn, "ddc")) {
- xf86LoaderReqSymLists(ddcSymbols, NULL);
- } else {
+ if (!xf86LoadSubModule(pScrn, "ddc")) {
/* ddc module not found, we can do without it */
pI128->ddc1Read = NULL;
@@ -887,9 +786,7 @@
/* - DDC can use I2C bus */
/* Load I2C if we have the code to use it */
if (pI128->i2cInit) {
- if ( xf86LoadSubModule(pScrn, "i2c") ) {
- xf86LoaderReqSymLists(i2cSymbols,NULL);
- } else {
+ if (!xf86LoadSubModule(pScrn, "i2c")) {
/* i2c module not found, we can do without it */
pI128->i2cInit = NULL;
pI128->I2C = NULL;
@@ -1194,7 +1091,6 @@
I128FreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(fbSymbols, NULL);
/* Load the acceleration engine */
if (!pI128->NoAccel) {
@@ -1211,12 +1107,12 @@
LoaderErrorMsg(NULL, "exa", errmaj, errmin);
I128FreeRec(pScrn);
return FALSE;
- } else xf86LoaderReqSymLists(exaSymbols, NULL);
+ }
} else {
if (!xf86LoadSubModule(pScrn, "xaa")) {
I128FreeRec(pScrn);
return FALSE;
- } else xf86LoaderReqSymLists(xaaSymbols, NULL);
+ }
}
}
@@ -1226,7 +1122,6 @@
I128FreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
I128UnmapMem(pScrn);
@@ -1442,12 +1337,21 @@
/*
* Unmap IO registers to virtual address space
*/
+#ifndef XSERVER_LIBPCIACCESS
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pI128->mem.mw0_ad,
pI128->MemorySize*1024);
+#else
+ pci_device_unmap_range(pI128->PciInfo, pI128->mem.mw0_ad,
+ pI128->MemorySize*1024);
+#endif
pI128->mem.mw0_ad = NULL;
pI128->MemoryPtr = NULL;
+#ifndef XSERVER_LIBPCIACCESS
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pI128->mem.rbase_g, 64*1024);
+#else
+ pci_device_unmap_range(pI128->PciInfo, pI128->mem.rbase_g, 64*1024);
+#endif
pI128->mem.rbase_g = NULL;
pI128->mem.rbase_w = NULL;
pI128->mem.rbase_a = NULL;
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-i128-1.3.1/src/i128exa.c new/xf86-video-i128-1.3.2/src/i128exa.c
--- old/xf86-video-i128-1.3.1/src/i128exa.c 2008-09-04 19:51:28.000000000 +0200
+++ new/xf86-video-i128-1.3.2/src/i128exa.c 2009-05-27 23:31:15.000000000 +0200
@@ -476,11 +476,15 @@
if (pMaskPicture) return FALSE;
/* when transforms added, be sure to check for linear/nearest */
- /* if (pSrcPicture->transform) return FALSE; */
+ if (pSrcPicture->transform && pSrcPicture->filter != PictFilterNearest)
+ return FALSE;
/* no support for external alpha */
if (pSrcPicture->alphaMap || pDstPicture->alphaMap) return FALSE;
+ /* driver currently doesn't support repeating */
+ if (pSrcPicture->repeat) return FALSE;
+
pI128->source = i128MapSourceFormat(pSrcPicture->format);
if (!pI128->source)
return FALSE;
++++++ xf86-video-i128-1.3.1.tar.bz2 -> xf86-video-i740-1.3.1.tar.bz2 ++++++
++++ 69298 lines of diff (skipped)
++++++ xf86-video-neomagic-1.2.2.tar.bz2 -> xf86-video-neomagic-1.2.3.tar.bz2 ++++++
++++ 54211 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-neomagic-1.2.2/config.h.in new/xf86-video-neomagic-1.2.3/config.h.in
--- old/xf86-video-neomagic-1.2.2/config.h.in 2008-12-22 05:37:38.000000000 +0100
+++ new/xf86-video-neomagic-1.2.3/config.h.in 2009-07-02 17:23:59.000000000 +0200
@@ -35,6 +35,10 @@
/* Define to 1 if you have the header file. */
#undef HAVE_UNISTD_H
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
/* Name of package */
#undef PACKAGE
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-neomagic-1.2.2/configure.ac new/xf86-video-neomagic-1.2.3/configure.ac
--- old/xf86-video-neomagic-1.2.2/configure.ac 2008-12-22 05:37:16.000000000 +0100
+++ new/xf86-video-neomagic-1.2.3/configure.ac 2009-07-02 17:23:34.000000000 +0200
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-neomagic],
- 1.2.2,
+ 1.2.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-neomagic)
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-neomagic-1.2.2/man/neomagic.man new/xf86-video-neomagic-1.2.3/man/neomagic.man
--- old/xf86-video-neomagic-1.2.2/man/neomagic.man 2008-03-10 06:21:31.000000000 +0100
+++ new/xf86-video-neomagic-1.2.3/man/neomagic.man 2009-05-27 23:31:30.000000000 +0200
@@ -90,7 +90,7 @@
.fi
.SH "SEE ALSO"
-__xservername__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(1), __xconfigfile__(__filemansuffix__), Xserver(1), X(__miscmansuffix__)
.SH AUTHORS
Authors include: Jens Owen, Kevin E. Martin, and also Egbert Eich,
Mark Vojkovich, Alan Hourihane.
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-neomagic-1.2.2/src/neo_driver.c new/xf86-video-neomagic-1.2.3/src/neo_driver.c
--- old/xf86-video-neomagic-1.2.2/src/neo_driver.c 2008-12-22 05:37:05.000000000 +0100
+++ new/xf86-video-neomagic-1.2.3/src/neo_driver.c 2009-05-28 20:21:05.000000000 +0200
@@ -412,79 +412,6 @@
{ -1, NULL, OPTV_NONE, {0}, FALSE }
};
-/*
- * List of symbols from other modules that this module references. This
- * list is used to tell the loader that it is OK for symbols here to be
- * unresolved providing that it hasn't been told that they haven't been
- * told that they are essential via a call to xf86LoaderReqSymbols() or
- * xf86LoaderReqSymLists(). The purpose is this is to avoid warnings about
- * unresolved symbols that are not required.
- */
-
-static const char *vgahwSymbols[] = {
- "vgaHWFreeHWRec",
- "vgaHWGetHWRec",
- "vgaHWGetIOBase",
- "vgaHWGetIndex",
- "vgaHWInit",
- "vgaHWLock",
- "vgaHWMapMem",
- "vgaHWProtect",
- "vgaHWRestore",
- "vgaHWSave",
- "vgaHWSaveScreenWeak",
- "vgaHWSetStdFuncs",
- "vgaHWUnlock",
- "vgaHWddc1SetSpeedWeak",
- NULL
-};
-
-static const char *fbSymbols[] = {
- "fbPictureInit",
- "fbScreenInit",
- NULL
-};
-
-static const char *xaaSymbols[] = {
- "XAACreateInfoRec",
- "XAADestroyInfoRec",
- "XAAInit",
- NULL
-};
-
-static const char *ramdacSymbols[] = {
- "xf86CreateCursorInfoRec",
- "xf86DestroyCursorInfoRec",
- "xf86InitCursor",
- NULL
-};
-
-static const char *shadowSymbols[] = {
- "shadowInit",
- NULL
-};
-
-static const char *ddcSymbols[] = {
- "xf86DoEDID_DDC1",
- "xf86DoEDID_DDC2",
- "xf86PrintEDID",
- "xf86SetDDCproperties",
- NULL
-};
-
-static const char *vbeSymbols[] = {
- "VBEInit",
- "vbeDoEDID",
- "vbeFree",
- NULL
-};
-
-static const char *i2cSymbols[] = {
- "xf86CreateI2CBusRec",
- "xf86I2CBusInit",
- NULL
-};
-
#ifdef XFree86LOADER
static MODULESETUPPROTO(neoSetup);
@@ -519,18 +446,6 @@
xf86AddDriver(&NEOMAGIC, module, 0);
/*
- * Modules that this driver always requires can be loaded here
- * by calling LoadSubModule().
- */
-
- /*
- * Tell the loader about symbols from other modules that this module
- * might refer to.
- */
- LoaderRefSymLists(vgahwSymbols, fbSymbols, xaaSymbols,
- ramdacSymbols, shadowSymbols,
- ddcSymbols, vbeSymbols, i2cSymbols, NULL);
- /*
* The return value must be non-NULL on success even though there
* is no TearDownProc.
*/
@@ -744,8 +659,6 @@
if (!xf86LoadSubModule(pScrn, "vgahw"))
return FALSE;
- xf86LoaderReqSymLists(vgahwSymbols, NULL);
-
/*
* Allocate a vgaHWRec.
*/
@@ -965,7 +878,6 @@
pScrn->monitor = pScrn->confScreen->monitor;
if (xf86LoadSubModule(pScrn, "ddc")) {
- xf86LoaderReqSymLists(ddcSymbols, NULL);
#if 1 /* for DDC1 testing */
if (!neoDoDDCVBE(pScrn))
if (!neoDoDDC2(pScrn))
@@ -1411,25 +1323,20 @@
RETURN;
}
- xf86LoaderReqSymLists(fbSymbols, NULL);
-
if (!nPtr->noLinear) {
if (!xf86LoadSubModule(pScrn, "xaa"))
RETURN;
- xf86LoaderReqSymLists(xaaSymbols, NULL);
}
if (nPtr->shadowFB) {
if (!xf86LoadSubModule(pScrn, "shadow")) {
RETURN;
}
- xf86LoaderReqSymLists(shadowSymbols, NULL);
}
if (!nPtr->swCursor) {
if (!xf86LoadSubModule(pScrn, "ramdac"))
RETURN;
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
return TRUE;
}
@@ -3208,7 +3115,6 @@
VGAwGR(0x09,0x26);
if (xf86LoadSubModule(pScrn, "i2c")) {
- xf86LoaderReqSymLists(i2cSymbols, NULL);
if (neo_I2CInit(pScrn)) {
ret = xf86SetDDCproperties(pScrn,xf86PrintEDID(xf86DoEDID_DDC2(
pScrn->scrnIndex,nPtr->I2C)));
@@ -3229,7 +3135,6 @@
VGAwGR(0x09,0x26);
if (xf86LoadSubModule(pScrn, "vbe")) {
- xf86LoaderReqSymLists(vbeSymbols, NULL);
if ((pVbe = VBEInit(NULL,nPtr->pEnt->index))) {
ret = xf86SetDDCproperties(
pScrn,xf86PrintEDID(vbeDoEDID(pVbe,NULL)));
++++++ xf86-video-nv-2.1.13.tar.bz2 -> xf86-video-nv-2.1.14.tar.bz2 ++++++
++++ 4114 lines of diff (skipped)
++++++ xf86-video-rendition-4.2.1.tar.bz2 -> xf86-video-rendition-4.2.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-rendition-4.2.1/COPYING new/xf86-video-rendition-4.2.2/COPYING
--- old/xf86-video-rendition-4.2.1/COPYING 2008-03-17 18:23:41.000000000 +0100
+++ new/xf86-video-rendition-4.2.2/COPYING 2009-05-27 23:31:46.000000000 +0200
@@ -1,12 +1,23 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved.
-Please submit updated COPYING files to the Xorg bugzilla:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is fur-
+nished to do so, subject to the following conditions:
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
+NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-http://lists.freedesktop.org/mailman/listinfo/xorg
+Except as contained in this notice, the name of the XFree86 Project shall not
+be used in advertising or otherwise to promote the sale, use or other deal-
+ings in this Software without prior written authorization from the XFree86
+Project.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-rendition-4.2.1/ChangeLog new/xf86-video-rendition-4.2.2/ChangeLog
--- old/xf86-video-rendition-4.2.1/ChangeLog 2009-02-24 16:15:44.000000000 +0100
+++ new/xf86-video-rendition-4.2.2/ChangeLog 2009-07-02 17:27:59.000000000 +0200
@@ -1,3 +1,21 @@
+commit c22f51f750dc495b9c58f8390c6a0d9fff756829
+Author: Adam Jackson
+Date: Thu May 28 15:13:38 2009 -0400
+
+ Remove useless loader symbol lists.
+
+commit 560e4fd2d289615297b7529bcbd61799db5b277b
+Author: Alan Coopersmith
+Date: Mon May 11 22:24:37 2009 -0700
+
+ Fill in COPYING file
+
+commit 7ad4b3479433de0cbfca7ba756b07df09678b22a
+Author: Adam Jackson
+Date: Tue Feb 24 10:17:19 2009 -0500
+
+ rendition 4.2.1
+
commit 29c9c203a1541df36685b6bedd3d4955c5882508
Author: Alan Coopersmith
Date: Fri Jan 9 16:32:50 2009 -0800
@@ -80,7 +98,7 @@
Add prototype for renditionGetRec.
commit 6d3e26e8311cf46a8c9ceb81debe5d8e97bf28bf
-Merge: 77647fe... ef00c3e...
+Merge: 77647fe ef00c3e
Author: Ian Romanick
Date: Fri Mar 2 20:48:05 2007 -0800
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-rendition-4.2.1/aclocal.m4 new/xf86-video-rendition-4.2.2/aclocal.m4
--- old/xf86-video-rendition-4.2.1/aclocal.m4 2009-02-24 16:15:30.000000000 +0100
+++ new/xf86-video-rendition-4.2.2/aclocal.m4 2009-07-02 17:27:47.000000000 +0200
@@ -2485,10 +2485,13 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # Add ABI-specific directories to the system library path.
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-rendition-4.2.1/configure new/xf86-video-rendition-4.2.2/configure
--- old/xf86-video-rendition-4.2.1/configure 2009-02-24 16:15:34.000000000 +0100
+++ new/xf86-video-rendition-4.2.2/configure 2009-07-02 17:27:52.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for xf86-video-rendition 4.2.1.
+# Generated by GNU Autoconf 2.63 for xf86-video-rendition 4.2.2.
#
# Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg.
#
@@ -745,8 +745,8 @@
# Identity of this package.
PACKAGE_NAME='xf86-video-rendition'
PACKAGE_TARNAME='xf86-video-rendition'
-PACKAGE_VERSION='4.2.1'
-PACKAGE_STRING='xf86-video-rendition 4.2.1'
+PACKAGE_VERSION='4.2.2'
+PACKAGE_STRING='xf86-video-rendition 4.2.2'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -1508,7 +1508,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-rendition 4.2.1 to adapt to many kinds of systems.
+\`configure' configures xf86-video-rendition 4.2.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1579,7 +1579,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-video-rendition 4.2.1:";;
+ short | recursive ) echo "Configuration of xf86-video-rendition 4.2.2:";;
esac
cat <<\_ACEOF
@@ -1692,7 +1692,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-video-rendition configure 4.2.1
+xf86-video-rendition configure 4.2.2
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1706,7 +1706,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-rendition $as_me 4.2.1, which was
+It was created by xf86-video-rendition $as_me 4.2.2, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2427,7 +2427,7 @@
# Define the identity of the package.
PACKAGE='xf86-video-rendition'
- VERSION='4.2.1'
+ VERSION='4.2.2'
cat >>confdefs.h <<_ACEOF
@@ -9816,10 +9816,13 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # Add ABI-specific directories to the system library path.
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -10764,7 +10767,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10767 "configure"
+#line 10770 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10860,7 +10863,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10863 "configure"
+#line 10866 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13864,7 +13867,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xf86-video-rendition $as_me 4.2.1, which was
+This file was extended by xf86-video-rendition $as_me 4.2.2, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13927,7 +13930,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-xf86-video-rendition config.status 4.2.1
+xf86-video-rendition config.status 4.2.2
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-rendition-4.2.1/configure.ac new/xf86-video-rendition-4.2.2/configure.ac
--- old/xf86-video-rendition-4.2.1/configure.ac 2009-02-24 16:15:10.000000000 +0100
+++ new/xf86-video-rendition-4.2.2/configure.ac 2009-07-02 17:27:27.000000000 +0200
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-rendition],
- 4.2.1,
+ 4.2.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-rendition)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-rendition-4.2.1/src/rendition.c new/xf86-video-rendition-4.2.2/src/rendition.c
--- old/xf86-video-rendition-4.2.1/src/rendition.c 2008-08-15 19:55:17.000000000 +0200
+++ new/xf86-video-rendition-4.2.2/src/rendition.c 2009-05-28 20:21:05.000000000 +0200
@@ -200,72 +200,6 @@
#endif
};
-static const char *vgahwSymbols[]={
- "vgaHWBlankScreen",
- "vgaHWDPMSSet",
- "vgaHWFreeHWRec",
- "vgaHWGetHWRec",
- "vgaHWGetIOBase",
- "vgaHWGetIndex",
- "vgaHWLock",
- "vgaHWMapMem",
- "vgaHWProtect",
- "vgaHWRestore",
- "vgaHWSave",
- "vgaHWSaveScreen",
- "vgaHWUnlock",
- "vgaHWHandleColormaps",
- NULL
-};
-
-static const char *ramdacSymbols[] = {
- "xf86CreateCursorInfoRec",
- "xf86DestroyCursorInfoRec",
- "xf86InitCursor",
- NULL
-};
-
-#if defined(XFree86LOADER) || USE_ACCEL
-static const char *xaaSymbols[] = {
- "XAACreateInfoRec",
- "XAADestroyInfoRec",
- "XAAInit",
- NULL
-};
-#endif
-
-static const char *ddcSymbols[] = {
- "xf86DoEDID_DDC1",
- "xf86PrintEDID",
- NULL
-};
-
-static const char *int10Symbols[] = {
- "xf86FreeInt10",
- "xf86InitInt10",
- NULL
-};
-
-static const char *fbSymbols[]={
- "fbScreenInit",
- "fbPictureInit",
- NULL
-};
-
-static const char *shadowfbSymbols[] = {
- "ShadowFBInit",
- NULL
-};
-
-static const char *vbeSymbols[] = {
- "VBEInit",
- "vbeDoEDID",
- "vbeFree",
- NULL
-};
-
-
-
#ifdef XFree86LOADER
/* Module loader interface */
@@ -297,9 +231,6 @@
if (!Initialised) {
Initialised = TRUE;
xf86AddDriver(&RENDITION, Module, 1);
- LoaderRefSymLists(vgahwSymbols, ramdacSymbols,
- fbSymbols, xaaSymbols, ddcSymbols, int10Symbols,
- shadowfbSymbols, vbeSymbols, NULL);
return (pointer) TRUE;
}
@@ -597,8 +528,6 @@
if (xf86LoadSubModule(pScreenInfo, "int10")){
xf86Int10InfoPtr pInt=NULL;
- xf86LoaderReqSymLists(int10Symbols, NULL);
-
xf86DrvMsg(pScreenInfo->scrnIndex, X_INFO, "Initializing int10\n");
pInt = xf86InitInt10(pRendition->pEnt->index);
xf86FreeInt10(pInt);
@@ -678,8 +607,6 @@
if (!xf86LoadSubModule(pScreenInfo, "fb"))
return FALSE;
- xf86LoaderReqSymLists(fbSymbols, NULL);
-
/* determine colour weights */
pScreenInfo->rgbBits=8;
@@ -727,7 +654,6 @@
if (!xf86LoadSubModule(pScreenInfo, "vgahw")){
return FALSE;
}
- xf86LoaderReqSymLists(vgahwSymbols, NULL);
if (!vgaHWGetHWRec(pScreenInfo))
return FALSE;
@@ -827,7 +753,6 @@
"Oops, \"ShadowFB\" module loading failed, disabling ShadowFB!\n");
}
else{
- xf86LoaderReqSymLists(shadowfbSymbols, NULL);
pRendition->board.shadowfb=TRUE;
xf86DrvMsg(pScreenInfo->scrnIndex, X_INFO,
"Using \"Shadow Framebuffer\"\n");
@@ -846,7 +771,6 @@
if (!xf86LoadSubModule(pScreenInfo, "ramdac")) {
return FALSE;
}
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
#if 0
@@ -857,7 +781,6 @@
("Loading of DDC library failed, skipping DDC-probe\n"));
}
else {
- xf86LoaderReqSymLists(ddcSymbols, NULL);
pScreenInfo->monitor->DDC = renditionDDC(pScreenInfo);
}
}
@@ -874,7 +797,6 @@
}
else {
xf86MonPtr mon;
- xf86LoaderReqSymLists(ddcSymbols, NULL);
mon = renditionProbeDDC(pScreenInfo, pRendition->pEnt->index);
xf86PrintEDID(mon);
xf86SetDDCproperties(pScreenInfo, mon);
@@ -951,7 +873,6 @@
!pRendition->board.shadowfb) {
/* Load XAA if needed */
if (xf86LoadSubModule(pScreenInfo, "xaa")) {
- xf86LoaderReqSymLists(xaaSymbols, NULL);
renditionMapMem(pScreenInfo);
RENDITIONAccelPreInit (pScreenInfo);
renditionUnmapMem(pScreenInfo);
@@ -1551,8 +1472,6 @@
xf86MonPtr mon = NULL;
if (xf86LoadSubModule(pScreenInfo, "vbe")) {
- xf86LoaderReqSymLists(vbeSymbols, NULL);
-
pVbe = VBEInit(NULL,index);
mon = vbeDoEDID(pVbe, NULL);
vbeFree(pVbe);
++++++ xf86-video-s3-0.6.1.tar.bz2 -> xf86-video-s3-0.6.2.tar.bz2 ++++++
++++ 56618 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-0.6.1/ChangeLog new/xf86-video-s3-0.6.2/ChangeLog
--- old/xf86-video-s3-0.6.1/ChangeLog 2008-12-22 06:24:47.000000000 +0100
+++ new/xf86-video-s3-0.6.2/ChangeLog 2009-07-02 17:32:23.000000000 +0200
@@ -1,3 +1,44 @@
+2009-06-25 Evgeny M. zubok
+
+ * src/s3_driver.c:
+ Revert the old behaviour when the BIOS settings are used for
+ intialization of DRAM/VRAM timings, i. e. we don't touch the
+ timings during initialization phase until any memory option (like
+ slow_edodram) is specified.
+
+ Add manual page.
+
+2009-05-25 Evgeny M. Zubok
+
+ * src/s3_driver.c:
+ * src/s3_video.c:
+
+ Enable Xv extension for Trio64V+ (thanks to Egor Ivanov for
+ testing on real hardware) and Trio64UV+ (Tested only on Trio64V2 by
+ overriding Chipset with "Trio64UV+" but not on real hardware).
+
+ S3 Trio64V+ now using NewMMIO. Trio64V+ chips have the same ChipId
+ as Trio32/64 but only with chip revision greater or eq 0x40. So if
+ you have problems with NewMMIO, you may override ChipRev in "Device"
+ section of your xorg.conf: "ChipRev" 0x00. Note: disabling the NewMMIO
+ also disables overlay video (Xv) because it isn't implemented for
+ Old MMIO yet.
+
+2009-05-04 Evgeny M. Zubok
+
+ * src/s3_driver.c:
+ * src/s3_shadow.c:
+
+ Add shadowFB option. It can be used to speedup drawing when
+ hardware acceleration is undesirable or unavailable (for colour depth
+ 24 with 24 bpp framebuffer, for example). shadowFB is disabled by
+ default. Enabling shadowFB option disables HW acceleration. Thanks
+ to Egor Ivanov for initial porting of shadowFB from s3virge.
+
+ Interlace mode support.
+
+ Close bug #14999.
+
2008-07-06 Evgeny M. Zubok
* src/s3_video.c:
@@ -14,7 +55,7 @@
not implemented yet for all chipsets).
Close bug #5527: 24-bit colour depth support (24bpp and
- 32bpp framebuffer) for TRIO64V2. Acceleration doesn't work
+ 32bpp framebuffer) for TRIOs. Acceleration doesn't work
with packed colour mode (24 bpp FB) but works with 32bpp
framebuffer mode (hardware limitation? -- need data).
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-0.6.1/Makefile.am new/xf86-video-s3-0.6.2/Makefile.am
--- old/xf86-video-s3-0.6.1/Makefile.am 2008-03-10 02:26:58.000000000 +0100
+++ new/xf86-video-s3-0.6.2/Makefile.am 2009-07-02 17:32:23.000000000 +0200
@@ -19,4 +19,4 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = src
+SUBDIRS = src man
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-0.6.1/README new/xf86-video-s3-0.6.2/README
--- old/xf86-video-s3-0.6.1/README 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86-video-s3-0.6.2/README 2009-05-27 23:31:49.000000000 +0200
@@ -0,0 +1,20 @@
+xf86-video-s3 - Xorg driver for S3 chipsets other than ViRGE or Savage
+
+Please submit bugs & patches to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/driver/xf86-video-s3
+
+ http://cgit.freedesktop.org/xorg/driver/xf86-video-s3
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
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-0.6.1/config.h.in new/xf86-video-s3-0.6.2/config.h.in
--- old/xf86-video-s3-0.6.1/config.h.in 2008-12-22 06:26:59.000000000 +0100
+++ new/xf86-video-s3-0.6.2/config.h.in 2009-07-02 17:33:09.000000000 +0200
@@ -32,6 +32,10 @@
/* Define to 1 if you have the header file. */
#undef HAVE_UNISTD_H
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
/* Name of package */
#undef PACKAGE
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-0.6.1/configure.ac new/xf86-video-s3-0.6.2/configure.ac
--- old/xf86-video-s3-0.6.1/configure.ac 2008-12-22 06:25:40.000000000 +0100
+++ new/xf86-video-s3-0.6.2/configure.ac 2009-07-02 17:32:46.000000000 +0200
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-s3],
- 0.6.1,
+ 0.6.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-s3)
@@ -54,7 +54,7 @@
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.4 xproto fontsproto $REQUIRED_MODULES])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
@@ -83,7 +83,10 @@
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+XORG_CHECK_LINUXDOC
+
AC_OUTPUT([
Makefile
src/Makefile
+ man/Makefile
])
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-0.6.1/man/Makefile.am new/xf86-video-s3-0.6.2/man/Makefile.am
--- old/xf86-video-s3-0.6.1/man/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86-video-s3-0.6.2/man/Makefile.am 2009-07-02 17:32:23.000000000 +0200
@@ -0,0 +1,58 @@
+#
+# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation.
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the copyright holders shall
+# not be used in advertising or otherwise to promote the sale, use or
+# other dealings in this Software without prior written authorization
+# from the copyright holders.
+#
+
+drivermandir = $(DRIVER_MAN_DIR)
+
+driverman_PRE = @DRIVER_NAME@.man
+
+driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
+
+EXTRA_DIST = @DRIVER_NAME@.man
+
+CLEANFILES = $(driverman_DATA)
+
+SED = sed
+
+# Strings to replace in man pages
+XORGRELSTRING = @PACKAGE_STRING@
+ XORGMANNAME = X Version 11
+
+MAN_SUBSTS = \
+ -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+ -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+ -e 's|__xservername__|Xorg|g' \
+ -e 's|__xconfigfile__|xorg.conf|g' \
+ -e 's|__projectroot__|$(prefix)|g' \
+ -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
+ -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
+ -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
+ -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
+ -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
+
+SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
+
+.man.$(DRIVER_MAN_SUFFIX):
+ sed $(MAN_SUBSTS) < $< > $@
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-0.6.1/man/s3.man new/xf86-video-s3-0.6.2/man/s3.man
--- old/xf86-video-s3-0.6.1/man/s3.man 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86-video-s3-0.6.2/man/s3.man 2009-07-02 17:32:23.000000000 +0200
@@ -0,0 +1,240 @@
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH s3 __drivermansuffix__ __vendorversion__
+.SH NAME
+s3 \- S3 video driver
+.SH SYNOPSIS
+.B Section \*qDevice\*q
+.RS 2
+.B Identifier \*q\fIdevname\fP\*q
+.br
+.B Driver \*qs3\*q
+.br
+.B ...
+.br
+[\fBOption\fP "optionname" ["optionvalue"]]
+.RE
+.B EndSection
+
+.SH SUPPORTED HARDWARE
+The
+.B s3
+driver supports PCI video cards based on the following S3 chips:
+.TP 12
+.B Trio32
+86C732
+.TP 12
+.B Trio64
+86C764
+.TP 12
+.B Trio64V+
+86C765
+.TP 12
+.B Aurora64V+
+86CM65
+.TP 12
+.B Trio64UV+
+86C767
+.TP 12
+.B Trio64V2/DX
+86C775
+.TP 12
+.B Trio64V2/GX
+86C785
+.TP 12
+.B Vision964
+86C964
+.TP 12
+.B Vision968
+86C968
+
+.PP
+Also driver supports the following RAMDACs:
+.TP 12
+.B IBM 524, IBM 524A, IBM 526, IBM 526DB
+.TP 12
+.B TI ViewPoint 3025
+
+.SH DESCRIPTION
+\fBs3\fP is an __xservername__ driver for S3 based video cards. The
+driver provides full accelerated support for the following colour
+depths: 8, 15, 16 and 24. The overlay video (Xv) is supported in
+depths 16 and 24 for the Trio64V+, Trio64UV+, Trio64V2/DX and
+Trio64V2/GX chips.
+
+.SH CONFIGURATION DETAILS
+Please refer to __xconfigfile__(__filemansuffix__) for general
+configuration details. This section only covers configuration details
+specific to this driver. All options names are case and white space
+insensitive when parsed by the server, for example, "trio 32/64" and
+"Trio32/64" are equivalent.
+
+.SS
+Chip overriding
+.PP
+The driver auto-detects the chipset and RAMDAC, but the following
+\fBChipset\fP names may optionally be specified in the configuration
+file \fB\*qDevice\*q\fP section, and will override the auto-detection:
+
+.PP
+.RS 4
+.TP 18
+"964-0", "964-1"
+86C964 (rev.0 and rev.1)
+.TP 18
+"968"
+86C968
+.TP 18
+"Trio32/64"
+86C732/86C764
+.TP 18
+"Aurora64V+"
+86CM65
+.TP 18
+"Trio64UV+"
+86C767
+.TP 18
+"Trio64V2/DX/GX"
+86C775/86C785
+.RE
+
+.PP
+The 86C765 (Trio64V+) is \fBChipset\fP "Trio32/64" with \fBChipRev\fP
+greater or equal 0x40.
+
+An overriding of RAMDAC auto-detection currently is not implemented.
+
+.SS
+Colour depth
+.PP
+For every supported colour depth the X server automatically selects an
+appropriate number of bits per pixel (bpp) for framebuffer. The depth
+8 is represented by 8 bpp framebuffer (1 byte/pixel), the depths 15
+and 16 (respectively 5.5.5 and 5.6.5 pixel formats) are represented by
+the 16 bpp framebuffer (2 bytes/pixel). Whenever the depth 24 is
+configured, the X server by default uses the 32 bpp framebuffer (4
+bytes/pixel), and the hardware is adjusted accordingly to the X.8.8.8
+pixel format, where X is the ignored upper byte.
+
+.PP
+As the second option for the depth 24, the X server can be configured
+to use 24 bpp framebuffer with the 8.8.8 pixel format (3 bytes/pixel),
+which is supported by Trio64V+, Trio64UV+, Trio64V2/DX and
+Trio64V2/GX. If the video board has limited video RAM the 24 bpp
+framebuffer has an advantage over 32 bpp framebuffer as it requires
+less memory to store screen, and, therefore, more space will be
+available for a video frame (see "Overlay video" section). The 24 bpp
+framebuffer can be selected by X server's option \fB-fbbpp 24\fP or by
+specifying \fBDefaultFbBpp\fP option in
+__xconfigfile__(__filemansuffix__):
+
+.RS 4
+.B Section \*qScreen\*q
+.RS 2
+.B DefaultFbBpp 24
+.br
+.B DefaultDepth 24
+.br
+.B ...
+.RE
+.B EndSection
+.RE
+
+.PP
+However, the 24 bpp framebuffer mode has the hardware limitations: (i)
+the 2D acceleration doesn't work with this mode (use the
+\fB\*qshadowFB\*q\fP option to speed up drawing routines in this
+case); (ii) 24 bpp framebuffer cannot be used with either interlaced
+or doublescan graphics modes.
+
+.SS
+Overlay video
+.PP
+If your video board has limited RAM it would be useful to estimate how
+large video frame might be placed in offscreen video memory. Suppose
+that the video board has 2 MB of RAM, and X server is configured to
+display 800x600 with the depth 24. By default the 32 bpp framebuffer
+will be chosen for this depth, so 800 x 600 x 4 = 1875 kB will be
+reserved for screen, and 2 MB - 1875 kB = 173 kB will remain for the
+offscreen area. This is sufficient space, for example, for the VCD
+NTSC 352x240 frame. If you need to upscale video with a bigger frame,
+but it doesn't fit the offscreen area, the only way to do this is to
+lower either the resolution or framebuffer's depth or both before the
+viewing, otherwise, you will get the allocation error and will not see
+the video. For example, with 24 bpp framebuffer and the same
+resolution 800x600 the offscreen area will be about 640 kB - it's
+enough for the 640x480 frame. 800x600 with the 16 bpp framebuffer
+gives about 1110 kB of offscreen area - this allows to upscale up to
+768x576 movies. Note, that all movie resolutions in examples above are
+provided as a reference; the movies can have the different aspect
+ratios and non-standard dimensions. A total pixel amount is the main
+consideration not the certain width and height.
+.PP
+Due to hardware limitation the overlay video will not work with the
+interlaced/doublescan modes. Downscaling is not implemented in
+hardware.
+
+.SS
+Configuration options
+.PP
+The following display
+.B Options
+are supported:
+.TP
+.BI "Option \*qHWCursor\*q \*q" boolean \*q
+Enable or disable the hardware cursor. Currently, hardware cursor is
+not implemented, so the option will be ignored. Default: off (software
+cursor).
+.TP
+.BI "Option \*qNoAccel\*q \*q" boolean \*q
+Disable acceleration. Very useful for determining if the driver has
+problems with drawing and acceleration routines. This is the first
+option to try if your server runs but you see graphic corruption on
+the screen. Using it decreases performance, as it uses software
+emulation for drawing operations the video driver can accelerate with
+hardware. Default: off (acceleration is enabled).
+.TP
+.BI "Option \*qShadowFB\*q \*q" boolean \*q
+Use shadow framebuffer. Disables hardware acceleration. Use this
+option when the hardware acceleration is not available or
+undesirable. Default: off.
+.TP
+.BI "Option \*qXVideo\*q \*q" boolean \*q
+Enable or disable Xv support. Default: on.
+
+.PP
+The following video memory \fBOptions\fP are supported:
+.TP
+.BI "Option \*qslow_dram_refresh\*q \*q" boolean \*q
+Enable three refresh cycles per scanline. Default: off (one refresh
+cycle).
+.TP
+.BI "Option \*qslow_edodram\*q \*q" boolean \*q
+Switch to 2-cycle EDO mode. Try this if you encounter pixel
+corruption. Using this option will cause a decrease in
+performance. Default: off (BIOS defaults).
+.TP
+.BI "Option \*qslow_dram\*q \*q" boolean \*q
+For Trio and Aurora64V+ chips: increase -RAS Precharge Timing to 3.5
+MCLK. Try this option if you encounter pixel errors. Default: off
+(BIOS defaults).
+.TP
+.BI "Option \*qslow_vram\*q \*q" boolean \*q
+For Vision964, Vision968 chips: increase -RAS Low Timing to 4.5
+MCLK. Default: off (BIOS defaults).
+
+.SH SEE ALSO
+__xservername__(1), __xconfigfile__(__filemansuffix__), Xserver(1),
+X(__miscmansuffix__)
+
+.SH AUTHORS
+Thomas Roell, Mark Vojkovich, Kevin E. Martin, Amancio Hasty, Jon
+N. Tombs and others were the original authors of driver for XFree86
+3.x. Ani Joshi reworked driver for XFree86 4.x. The further
+modifications were made by the following contributors: Adam Jackson,
+Alan Coopersmith, Dave Airlie, Andrew Radrianasulu, Paulo Cesar
+Pereira de Andrade, Eric Anholt, Søren Sandmann Pedersen, Alex
+Deucher, Evgeny M. Zubok, Daniel Stone and others.
+
+.PP
+The manual was written by Evgeny M. Zubok
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-0.6.1/src/Makefile.am new/xf86-video-s3-0.6.2/src/Makefile.am
--- old/xf86-video-s3-0.6.1/src/Makefile.am 2008-12-22 06:24:47.000000000 +0100
+++ new/xf86-video-s3-0.6.2/src/Makefile.am 2009-05-27 23:31:49.000000000 +0200
@@ -39,7 +39,8 @@
s3_pcirename.h \
s3_reg.h \
s3_Ti.c \
- s3_Trio64DAC.c
+ s3_Trio64DAC.c \
+ s3_shadow.c
noinst_LTLIBRARIES = libs3_accel_newmmio.la libs3_accel_pio.la
s3_drv_la_LIBADD = libs3_accel_newmmio.la libs3_accel_pio.la
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-0.6.1/src/s3.h new/xf86-video-s3-0.6.2/src/s3.h
--- old/xf86-video-s3-0.6.1/src/s3.h 2008-12-22 06:24:47.000000000 +0100
+++ new/xf86-video-s3-0.6.2/src/s3.h 2009-05-27 23:31:49.000000000 +0200
@@ -163,6 +163,13 @@
int imageWidth;
int imageHeight;
Bool hwCursor;
+
+ Bool shadowFB;
+ int rotate;
+ unsigned char * ShadowPtr;
+ int ShadowPitch;
+ void (*PointerMoved)(int index, int x, int y);
+
} S3Rec, *S3Ptr;
#define S3PTR(p) ((S3Ptr)((p)->driverPrivate))
@@ -224,6 +231,15 @@
/* s3 gen cursor */
Bool S3_CursorInit(ScreenPtr pScreen);
+/* in s3_shadow.c */
+void S3PointerMoved(int index, int x, int y);
+void S3RefreshArea(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
+void S3RefreshArea8(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
+void S3RefreshArea16(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
+void S3RefreshArea24(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
+void S3RefreshArea32(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
+
+
#define TRIO64_RAMDAC 0x8811
#define TI3025_RAMDAC 0x3025
#define TI3020_RAMDAC 0x3020
@@ -242,9 +258,4 @@
(pS3->Chipset == PCI_CHIP_AURORA64VP) || \
(pS3->Chipset == PCI_CHIP_TRIO64UVP) || \
(pS3->Chipset == PCI_CHIP_TRIO64V2_DXGX))
-
-#define HAS_STREAMS_PROCESSOR() ((pS3->Chipset == PCI_CHIP_AURORA64VP) || \
- (pS3->Chipset == PCI_CHIP_TRIO64UVP) || \
- (pS3->Chipset == PCI_CHIP_TRIO64V2_DXGX))
-
#endif /* _S3_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-0.6.1/src/s3_driver.c new/xf86-video-s3-0.6.2/src/s3_driver.c
--- old/xf86-video-s3-0.6.1/src/s3_driver.c 2008-12-22 06:30:35.000000000 +0100
+++ new/xf86-video-s3-0.6.2/src/s3_driver.c 2009-07-02 17:32:23.000000000 +0200
@@ -54,7 +54,7 @@
#include "mibstore.h"
#include "fb.h"
#include "inputstr.h"
-
+#include "shadowfb.h"
#include "IBM.h"
#include "TI.h"
@@ -157,7 +157,9 @@
OPTION_SLOW_DRAM,
OPTION_SLOW_EDODRAM,
OPTION_SLOW_VRAM,
- OPTION_XVIDEO
+ OPTION_XVIDEO,
+ OPTION_SHADOW_FB,
+ OPTION_ROTATE
} S3Opts;
static OptionInfoRec S3Options[] = {
@@ -168,6 +170,8 @@
{ OPTION_SLOW_EDODRAM, "slow_edodram", OPTV_BOOLEAN, {0}, FALSE },
{ OPTION_SLOW_VRAM, "slow_vram", OPTV_BOOLEAN, {0}, FALSE },
{ OPTION_XVIDEO, "XVideo", OPTV_BOOLEAN, {0}, FALSE },
+ { OPTION_SHADOW_FB, "ShadowFB", OPTV_BOOLEAN, {0}, FALSE },
+ { OPTION_ROTATE, "Rotate", OPTV_ANYSTR, {0}, FALSE },
{ -1, NULL, OPTV_NONE, {0}, FALSE }
};
@@ -179,65 +183,6 @@
{ -1 }
};
-static const char *fbSymbols[] = {
- "fbPictureInit",
- "fbScreenInit",
- NULL
-};
-
-static const char *vgaHWSymbols[] = {
- "vgaHWGetHWRec",
- "vgaHWFreeHWRec",
- "vgaHWGetIOBase",
- "vgaHWSave",
- "vgaHWProtect",
- "vgaHWRestore",
- "vgaHWMapMem",
- "vgaHWUnmapMem",
- "vgaHWSaveScreen",
- "vgaHWLock",
- "vgaHWInit",
- "vgaHWDPMSSet",
- NULL
-};
-
-static const char *vbeSymbols[] = {
- "VBEInit",
- "vbeDoEDID",
- "vbeFree",
- NULL
-};
-
-static const char *int10Symbols[] = {
- "xf86ExecX86int10",
- "xf86FreeInt10",
- "xf86InitInt10",
- "xf86Int10AllocPages",
- "xf86Int10FreePages",
- NULL
-};
-
-static const char *ramdacSymbols[] = {
- "xf86InitCursor",
- "xf86CreateCursorInfoRec",
- "RamDacInit",
- "RamDacCreateInfoRec",
- "RamDacDestroyInfoRec",
- "RamDacHelperCreateInfoRec",
- "RamDacGetHWIndex",
- "IBMramdacProbe",
- "IBMramdac526CalculateMNPCForClock",
- "IBMramdac526SetBppWeak",
- NULL
-};
-
-static const char *xaaSymbols[] = {
- "XAADestroyInfoRec",
- "XAACreateInfoRec",
- "XAAInit",
- NULL
-};
-
static int s3AccelLinePitches[] = { 640, 800, 1024, 1280, 1600 };
#ifdef XFree86LOADER
@@ -267,11 +212,6 @@
if (!setupDone) {
setupDone = TRUE;
xf86AddDriver(&S3, module, 0);
- LoaderRefSymLists(vgaHWSymbols,
- vbeSymbols, int10Symbols, ramdacSymbols,
- fbSymbols,
- xaaSymbols,
- NULL);
return (pointer) 1;
} else {
if (errmaj)
@@ -372,6 +312,7 @@
Gamma gzeros = {0.0, 0.0, 0.0};
int i, vgaCRIndex, vgaCRReg;
unsigned char tmp;
+ char *s;
if (flags & PROBE_DETECT)
return FALSE;
@@ -379,8 +320,6 @@
if (!xf86LoadSubModule(pScrn, "vgahw"))
return FALSE;
- xf86LoaderReqSymLists(vgaHWSymbols, NULL);
-
if (!vgaHWGetHWRec(pScrn))
return FALSE;
@@ -435,6 +374,48 @@
pS3->SlowDRAM = xf86ReturnOptValBool(S3Options, OPTION_SLOW_DRAM, FALSE);
pS3->SlowEDODRAM = xf86ReturnOptValBool(S3Options, OPTION_SLOW_EDODRAM, FALSE);
pS3->SlowVRAM = xf86ReturnOptValBool(S3Options, OPTION_SLOW_VRAM, FALSE);
+
+
+
+ if (xf86GetOptValBool(S3Options, OPTION_SHADOW_FB, &pS3->shadowFB))
+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ShadowFB %s.\n",
+ pS3->shadowFB ? "enabled" : "disabled");
+
+ pS3->rotate = 0;
+ if ((s = xf86GetOptValString(S3Options, OPTION_ROTATE))) {
+ if(!xf86NameCmp(s, "CW")) {
+ /* accel is disabled below for shadowFB */
+ pS3->shadowFB = TRUE;
+ pS3->rotate = 1;
+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+ "Rotating screen clockwise - acceleration disabled\n");
+ } else if(!xf86NameCmp(s, "CCW")) {
+ pS3->shadowFB = TRUE;
+ pS3->rotate = -1;
+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Rotating screen"
+ "counter clockwise - acceleration disabled\n");
+ } else {
+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "\"%s\" is not a valid"
+ "value for Option \"Rotate\"\n", s);
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Valid options are \"CW\" or \"CCW\"\n");
+ }
+ }
+
+ if(pS3->shadowFB && !pS3->NoAccel) {
+ pS3->NoAccel = TRUE;
+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ "HW acceleration not supported with \"shadowFB\".\n");
+ }
+
+
+ if (pS3->rotate && pS3->HWCursor) {
+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ "HW cursor not supported with \"rotate\".\n");
+ pS3->HWCursor = FALSE;
+ }
+
+
if (pScrn->numEntities > 1) {
S3FreeRec(pScrn);
return FALSE;
@@ -448,15 +429,20 @@
}
if (xf86LoadSubModule(pScrn, "int10")) {
- xf86LoaderReqSymLists(int10Symbols, NULL);
pS3->pInt10 = xf86InitInt10(pEnt->index);
}
if (xf86LoadSubModule(pScrn, "vbe")) {
- xf86LoaderReqSymLists(vbeSymbols, NULL);
pS3->pVBE = VBEInit(pS3->pInt10, pEnt->index);
}
+ if (pS3->shadowFB) {
+ if (!xf86LoadSubModule(pScrn, "shadowfb")) {
+ S3FreeRec(pScrn);
+ return FALSE;
+ }
+ }
+
if (!xf86SetGamma(pScrn, gzeros))
return FALSE;
@@ -472,8 +458,8 @@
pS3->Chipset = pEnt->device->chipID;
pScrn->chipset = (char *)xf86TokenToString(S3Chipsets,
pS3->Chipset);
- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ChipID override: 0x%04X\n",
- pS3->Chipset);
+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+ "ChipID override: 0x%04X\n", pS3->Chipset);
} else {
pS3->Chipset = PCI_DEV_DEVICE_ID(pS3->PciInfo);
pScrn->chipset = (char *)xf86TokenToString(S3Chipsets,
@@ -488,7 +474,8 @@
xfree(pEnt);
- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Chipset: \"%s\"\n", pScrn->chipset);
+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Chipset: \"%s\"\n",
+ pScrn->chipset);
#ifndef XSERVER_LIBPCIACCESS
pS3->PciTag = pciTag(pS3->PciInfo->bus, pS3->PciInfo->device,
@@ -499,6 +486,10 @@
case PCI_CHIP_964_0:
case PCI_CHIP_964_1:
case PCI_CHIP_TRIO:
+ if (pS3->ChipRev >= 0x40) { /* S3 Trio64V+ has the New MMIO */
+ pS3->S3NewMMIO = TRUE;
+ break;
+ }
case PCI_CHIP_AURORA64VP: /* ??? */
pS3->S3NewMMIO = FALSE;
break;
@@ -509,7 +500,13 @@
break;
}
- if (HAS_STREAMS_PROCESSOR() && pS3->S3NewMMIO)
+ /* TODO: Streams Processor and Xv for Old MMIO */
+
+ if (((pS3->Chipset == PCI_CHIP_AURORA64VP) ||
+ (pS3->Chipset == PCI_CHIP_TRIO64UVP) ||
+ (pS3->Chipset == PCI_CHIP_TRIO64V2_DXGX) ||
+ ((pS3->Chipset == PCI_CHIP_TRIO) && (pS3->ChipRev >= 0x40)))
+ && (pS3->S3NewMMIO))
pS3->hasStreams = TRUE;
else
pS3->hasStreams = FALSE;
@@ -605,7 +602,6 @@
if (!xf86LoadSubModule(pScrn, "ramdac"))
return FALSE;
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
pScrn->rgbBits = 8; /* set default */
@@ -722,17 +718,15 @@
return FALSE;
}
- xf86SetCrtcForModes(pScrn, 0);
+ xf86SetCrtcForModes(pScrn, INTERLACE_HALVE_V);
pScrn->currentMode = pScrn->modes;
xf86PrintModes(pScrn);
xf86SetDpi(pScrn, 0, 0);
xf86LoadSubModule(pScrn, "fb");
- xf86LoaderReqSymLists(fbSymbols, NULL);
if (!xf86LoadSubModule(pScrn, "xaa"))
return FALSE;
- xf86LoaderReqSymLists(xaaSymbols, NULL);
return TRUE;
}
@@ -744,6 +738,16 @@
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
S3Ptr pS3 = S3PTR(pScrn);
BoxRec ScreenArea;
+ int width, height, displayWidth;
+
+ if (pS3->rotate) {
+ height = pScrn->virtualX;
+ width = pScrn->virtualY;
+ } else {
+ width = pScrn->virtualX;
+ height = pScrn->virtualY;
+ }
+
pScrn->fbOffset = 0;
@@ -778,7 +782,18 @@
miSetPixmapDepths ();
- if (!fbScreenInit(pScreen, pS3->FBBase, pScrn->virtualX,
+ /* no screen rotation assumed */
+ if(pS3->shadowFB) {
+ pS3->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width);
+ pS3->ShadowPtr = xalloc(pS3->ShadowPitch * height);
+ displayWidth = pS3->ShadowPitch / (pScrn->bitsPerPixel >> 3);
+ } else {
+ pS3->ShadowPtr = NULL;
+ displayWidth = pScrn->displayWidth;
+ }
+
+ if (!fbScreenInit(pScreen, (pS3->shadowFB ? pS3->ShadowPtr : pS3->FBBase),
+ pScrn->virtualX,
pScrn->virtualY, pScrn->xDpi, pScrn->yDpi,
pScrn->displayWidth, pScrn->bitsPerPixel))
return FALSE;
@@ -824,7 +839,6 @@
ScreenArea.x1, ScreenArea.y1,
ScreenArea.x2, ScreenArea.y2);
-
/* 2D acceleration setup */
if (pS3->NoAccel)
@@ -832,13 +846,13 @@
"Acceleration disabled (by option)\n");
/* It seems that acceleration isn't supported for 24-bit packed
- colour. Disable it for S3 Trio64V2 */
- if (!pS3->NoAccel && (pScrn->bitsPerPixel == 24) &&
- (pS3->Chipset == PCI_CHIP_TRIO64V2_DXGX)) {
- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Acceleration isn't supported for 24 bpp. Disabled.\n");
+ colour. So disable it. Using shadowFB is recommended in this mode. */
+ if (!pS3->NoAccel && (pScrn->bitsPerPixel == 24)) {
+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "HW acceleration isn't supported for 24 bpp. Disabled.\n");
pS3->NoAccel = TRUE;
}
+
if (!pS3->NoAccel) {
if (pS3->S3NewMMIO)
if (S3AccelInitNewMMIO(pScreen)) {
@@ -882,6 +896,28 @@
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Using SW cursor\n");
+ /* Shadow framebuffer setup */
+
+ if (pS3->shadowFB) {
+ RefreshAreaFuncPtr refreshArea = S3RefreshArea;
+
+ if (pS3->rotate) {
+ if (!pS3->PointerMoved) {
+ pS3->PointerMoved = pScrn->PointerMoved;
+ pScrn->PointerMoved = S3PointerMoved;
+ }
+
+ switch (pScrn->bitsPerPixel) {
+ case 8: refreshArea = S3RefreshArea8; break;
+ case 16: refreshArea = S3RefreshArea16; break;
+ case 24: refreshArea = S3RefreshArea24; break;
+ case 32: refreshArea = S3RefreshArea32; break;
+ }
+ }
+
+ ShadowFBInit(pScreen, refreshArea);
+ }
+
if (!miCreateDefColormap(pScreen))
@@ -1204,7 +1240,6 @@
vgaRegPtr pVga = &hwp->ModeReg;
int vgaCRIndex = pS3->vgaCRIndex, vgaCRReg = pS3->vgaCRReg;
int vgaIOBase = hwp->IOBase;
- int interlacedived = mode->Flags & V_INTERLACE ? 1 : 0;
int r, n, m;
unsigned char tmp;
@@ -1226,9 +1261,6 @@
if ((mode->HTotal == mode->CrtcHTotal) && (pS3->pixMuxShift != 0)) {
if (pS3->pixMuxShift > 0) {
- /* XXX hack */
-/* mode->Flags |= V_PIXMUX; */
-
mode->CrtcHTotal >>= pS3->pixMuxShift;
mode->CrtcHDisplay >>= pS3->pixMuxShift;
mode->CrtcHBlankStart >>= pS3->pixMuxShift;
@@ -1237,8 +1269,6 @@
mode->CrtcHSyncEnd >>= pS3->pixMuxShift;
mode->CrtcHSkew >>= pS3->pixMuxShift;
} else if (pS3->pixMuxShift < 0) {
-/* mode->Flags |= V_PIXMUX; */
-
mode->CrtcHTotal <<= -pS3->pixMuxShift;
mode->CrtcHDisplay <<= -pS3->pixMuxShift;
mode->CrtcHBlankStart <<= -pS3->pixMuxShift;
@@ -1249,15 +1279,6 @@
}
}
- /* This shouldn't be needed -- they should be set by vgaHWInit() */
- if (!mode->CrtcVAdjusted) {
- mode->CrtcVTotal >>= interlacedived;
- mode->CrtcVDisplay >>= interlacedived;
- mode->CrtcVSyncStart >>= interlacedived;
- mode->CrtcVSyncEnd >>= interlacedived;
- mode->CrtcVAdjusted = TRUE;
- }
-
if (!vgaHWInit(pScrn, mode))
return FALSE;
@@ -1461,7 +1482,7 @@
new->cr60 = n;
outb(vgaCRReg, new->cr60);
- if (pS3->Chipset == PCI_CHIP_TRIO64V2_DXGX) {
+ if (pS3->hasStreams) {
new->cr60 = 255;
outb(vgaCRIndex, 0x60);
outb(vgaCRReg, new->cr60);
@@ -1550,7 +1571,7 @@
outb(vgaCRReg, new->cr42);
}
- if (pS3->Chipset == PCI_CHIP_TRIO64V2_DXGX) {
+ if (pS3->hasStreams) {
unsigned char a;
outb(vgaCRIndex, 0x67);
@@ -1638,35 +1659,14 @@
new->cr66 |= 0x80;
outb(vgaCRReg, new->cr66);
+
if (pS3->SlowDRAMRefresh)
new->cr3a = 0xb7;
- else
+ else
new->cr3a = 0xb5;
outb(vgaCRIndex, 0x3a);
outb(vgaCRReg, new->cr3a);
- /*
- Set 3.5 MCLKs for -RAS low, 2.5 MCLKs for -RAS precharge,
- disable -CAS/-OE adjustment. It seems that cr68 has different
- format for 96x and TRIOs
- */
- if (!((pS3->Chipset == PCI_CHIP_968) ||
- (pS3->Chipset == PCI_CHIP_964_0) ||
- (pS3->Chipset == PCI_CHIP_964_1))) {
-
- outb(vgaCRIndex, 0x39);
- outb(vgaCRReg, 0xa5);
-
- outb(vgaCRIndex, 0x68);
- tmp = inb(vgaCRReg) & ~0x0f;
- outb(vgaCRReg, tmp | 0x0f);
-
- /* Enable 1-cycle EDO access */
- outb(vgaCRIndex, 0x36);
- tmp = inb(vgaCRReg);
- outb(vgaCRReg, tmp & 0xf3);
- }
-
if (pS3->SlowVRAM) {
/*
* some Diamond Stealth 64 VRAM cards have a problem with
@@ -1932,71 +1932,6 @@
{
S3Ptr pS3 = S3PTR(pScrn);
int vgaCRIndex = pS3->vgaCRIndex, vgaCRReg = pS3->vgaCRReg;
-
-#if 0
- outb(vgaCRIndex, 0x31);
- ErrorF("cr31 = 0x%x\n", inb(vgaCRReg));
- outb(vgaCRIndex, 0x32);
- ErrorF("cr32 = 0x%x\n", inb(vgaCRReg));
- outb(vgaCRIndex, 0x33);
- ErrorF("cr33 = 0x%x\n", inb(vgaCRReg));
- outb(vgaCRIndex, 0x34);
- ErrorF("cr34 = 0x%x\n", inb(vgaCRReg));
- outb(vgaCRIndex, 0x3a);
- ErrorF("cr3a = 0x%x\n", inb(vgaCRReg));
- outb(vgaCRIndex, 0x3b);
- ErrorF("cr3b = 0x%x\n", inb(vgaCRReg));
- outb(vgaCRIndex, 0x3c);
- ErrorF("cr3c = 0x%x\n", inb(vgaCRReg));
-
- outb(vgaCRIndex, 0x40);
- ErrorF("cr40 = 0x%x\n", inb(vgaCRReg));
- outb(vgaCRIndex, 0x42);
- ErrorF("cr42 = 0x%x\n", inb(vgaCRReg));
- outb(vgaCRIndex, 0x43);
- ErrorF("cr43 = 0x%x\n", inb(vgaCRReg));
- outb(vgaCRIndex, 0x44);
- ErrorF("cr44 = 0x%x\n", inb(vgaCRReg));
- outb(vgaCRIndex, 0x45);
- ErrorF("cr45 = 0x%x\n", inb(vgaCRReg));
-
- outb(vgaCRIndex, 0x50);
- ErrorF("cr50 = 0x%x\n", inb(vgaCRReg));
- outb(vgaCRIndex, 0x51);
- ErrorF("cr51 = 0x%x\n", inb(vgaCRReg));
- outb(vgaCRIndex, 0x53);
- ErrorF("cr53 = 0x%x\n", inb(vgaCRReg));
- outb(vgaCRIndex, 0x54);
- ErrorF("cr54 = 0x%x\n", inb(vgaCRReg));
- outb(vgaCRIndex, 0x55);
- ErrorF("cr55 = 0x%x\n", inb(vgaCRReg));
- outb(vgaCRIndex, 0x58);
- ErrorF("cr58 = 0x%x\n", inb(vgaCRReg));
- outb(vgaCRIndex, 0x59);
- ErrorF("cr59 = 0x%x\n", inb(vgaCRReg));
- outb(vgaCRIndex, 0x5a);
- ErrorF("cr5a = 0x%x\n", inb(vgaCRReg));
- outb(vgaCRIndex, 0x5d);
- ErrorF("cr5d = 0x%x\n", inb(vgaCRReg));
- outb(vgaCRIndex, 0x5e);
- ErrorF("cr5e = 0x%x\n", inb(vgaCRReg));
-
- outb(vgaCRIndex, 0x60);
- ErrorF("cr60 = 0x%x\n", inb(vgaCRReg));
- outb(vgaCRIndex, 0x61);
- ErrorF("cr61 = 0x%x\n", inb(vgaCRReg));
- outb(vgaCRIndex, 0x62);
- ErrorF("cr62 = 0x%x\n", inb(vgaCRReg));
- outb(vgaCRIndex, 0x65);
- ErrorF("cr65 = 0x%x\n", inb(vgaCRReg));
- outb(vgaCRIndex, 0x66);
- ErrorF("cr66 = 0x%x\n", inb(vgaCRReg));
- outb(vgaCRIndex, 0x67);
- ErrorF("cr67 = 0x%x\n", inb(vgaCRReg));
- outb(vgaCRIndex, 0x6d);
- ErrorF("cr6d = 0x%x\n", inb(vgaCRReg));
-
-#else
{
int j;
@@ -2005,8 +1940,6 @@
ErrorF("CRTC 0x%x = 0x%x\n", j, inb(vgaCRReg));
}
}
-#endif
-
#if 0
ErrorF("DAC regs\n");
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-0.6.1/src/s3_shadow.c new/xf86-video-s3-0.6.2/src/s3_shadow.c
--- old/xf86-video-s3-0.6.1/src/s3_shadow.c 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86-video-s3-0.6.2/src/s3_shadow.c 2009-05-27 23:31:49.000000000 +0200
@@ -0,0 +1,274 @@
+/*
+Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the XFree86 Project shall not
+be used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from the XFree86 Project.
+*/
+
+/*
+ Copyright (c) 1999,2000 The XFree86 Project Inc.
+ based on code written by Mark Vojkovich
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include "xf86Resources.h"
+#include "xf86PciInfo.h"
+#include "xf86Pci.h"
+#include "shadowfb.h"
+#include "servermd.h"
+#include "s3.h"
+
+
+void
+S3RefreshArea(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
+{
+ S3Ptr pS3 = S3PTR(pScrn);
+ int width, height, Bpp, FBPitch;
+ unsigned char *src, *dst;
+
+ Bpp = pScrn->bitsPerPixel >> 3;
+ FBPitch = BitmapBytePad(pScrn->displayWidth * pScrn->bitsPerPixel);
+
+ while(num--) {
+ width = (pbox->x2 - pbox->x1) * Bpp;
+ height = pbox->y2 - pbox->y1;
+ src = pS3->ShadowPtr + (pbox->y1 * pS3->ShadowPitch) +
+ (pbox->x1 * Bpp);
+ dst = pS3->FBBase + (pbox->y1 * FBPitch) + (pbox->x1 * Bpp);
+
+ while(height--) {
+ memcpy(dst, src, width);
+ dst += FBPitch;
+ src += pS3->ShadowPitch;
+ }
+
+ pbox++;
+ }
+}
+
+void
+S3PointerMoved(int index, int x, int y)
+{
+ ScrnInfoPtr pScrn = xf86Screens[index];
+ S3Ptr pS3 = S3PTR(pScrn);
+ int newX, newY;
+
+ if(pS3->rotate == 1) {
+ newX = pScrn->pScreen->height - y - 1;
+ newY = x;
+ } else {
+ newX = y;
+ newY = pScrn->pScreen->width - x - 1;
+ }
+
+ (*pS3->PointerMoved)(index, newX, newY);
+}
+
+void
+S3RefreshArea8(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
+{
+ S3Ptr pS3 = S3PTR(pScrn);
+ int count, width, height, y1, y2, dstPitch, srcPitch;
+ CARD8 *dstPtr, *srcPtr, *src;
+ CARD32 *dst;
+
+ dstPitch = pScrn->displayWidth;
+ srcPitch = -pS3->rotate * pS3->ShadowPitch;
+
+ while(num--) {
+ width = pbox->x2 - pbox->x1;
+ y1 = pbox->y1 & ~3;
+ y2 = (pbox->y2 + 3) & ~3;
+ height = (y2 - y1) >> 2; /* in dwords */
+
+ if(pS3->rotate == 1) {
+ dstPtr = pS3->FBBase +
+ (pbox->x1 * dstPitch) + pScrn->virtualX - y2;
+ srcPtr = pS3->ShadowPtr + ((1 - y2) * srcPitch) + pbox->x1;
+ } else {
+ dstPtr = pS3->FBBase +
+ ((pScrn->virtualY - pbox->x2) * dstPitch) + y1;
+ srcPtr = pS3->ShadowPtr + (y1 * srcPitch) + pbox->x2 - 1;
+ }
+
+ while(width--) {
+ src = srcPtr;
+ dst = (CARD32*)dstPtr;
+ count = height;
+ while(count--) {
+ *(dst++) = src[0] | (src[srcPitch] << 8) |
+ (src[srcPitch * 2] << 16) |
+ (src[srcPitch * 3] << 24);
+ src += srcPitch * 4;
+ }
+ srcPtr += pS3->rotate;
+ dstPtr += dstPitch;
+ }
+
+ pbox++;
+ }
+}
+
+
+void
+S3RefreshArea16(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
+{
+ S3Ptr pS3 = S3PTR(pScrn);
+ int count, width, height, y1, y2, dstPitch, srcPitch;
+ CARD16 *dstPtr, *srcPtr, *src;
+ CARD32 *dst;
+
+ dstPitch = pScrn->displayWidth;
+ srcPitch = -pS3->rotate * pS3->ShadowPitch >> 1;
+
+ while(num--) {
+ width = pbox->x2 - pbox->x1;
+ y1 = pbox->y1 & ~1;
+ y2 = (pbox->y2 + 1) & ~1;
+ height = (y2 - y1) >> 1; /* in dwords */
+
+ if(pS3->rotate == 1) {
+ dstPtr = (CARD16*)pS3->FBBase +
+ (pbox->x1 * dstPitch) + pScrn->virtualX - y2;
+ srcPtr = (CARD16*)pS3->ShadowPtr +
+ ((1 - y2) * srcPitch) + pbox->x1;
+ } else {
+ dstPtr = (CARD16*)pS3->FBBase +
+ ((pScrn->virtualY - pbox->x2) * dstPitch) + y1;
+ srcPtr = (CARD16*)pS3->ShadowPtr +
+ (y1 * srcPitch) + pbox->x2 - 1;
+ }
+
+ while(width--) {
+ src = srcPtr;
+ dst = (CARD32*)dstPtr;
+ count = height;
+ while(count--) {
+ *(dst++) = src[0] | (src[srcPitch] << 16);
+ src += srcPitch * 2;
+ }
+ srcPtr += pS3->rotate;
+ dstPtr += dstPitch;
+ }
+
+ pbox++;
+ }
+}
+
+
+/* this one could be faster */
+void
+S3RefreshArea24(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
+{
+ S3Ptr pS3 = S3PTR(pScrn);
+ int count, width, height, y1, y2, dstPitch, srcPitch;
+ CARD8 *dstPtr, *srcPtr, *src;
+ CARD32 *dst;
+
+ dstPitch = BitmapBytePad(pScrn->displayWidth * 24);
+ srcPitch = -pS3->rotate * pS3->ShadowPitch;
+
+ while(num--) {
+ width = pbox->x2 - pbox->x1;
+ y1 = pbox->y1 & ~3;
+ y2 = (pbox->y2 + 3) & ~3;
+ height = (y2 - y1) >> 2; /* blocks of 3 dwords */
+
+ if(pS3->rotate == 1) {
+ dstPtr = pS3->FBBase +
+ (pbox->x1 * dstPitch) + ((pScrn->virtualX - y2) * 3);
+ srcPtr = pS3->ShadowPtr + ((1 - y2) * srcPitch) + (pbox->x1 * 3);
+ } else {
+ dstPtr = pS3->FBBase +
+ ((pScrn->virtualY - pbox->x2) * dstPitch) + (y1 * 3);
+ srcPtr = pS3->ShadowPtr + (y1 * srcPitch) + (pbox->x2 * 3) - 3;
+ }
+
+ while(width--) {
+ src = srcPtr;
+ dst = (CARD32*)dstPtr;
+ count = height;
+ while(count--) {
+ dst[0] = src[0] | (src[1] << 8) | (src[2] << 16) |
+ (src[srcPitch] << 24);
+ dst[1] = src[srcPitch + 1] | (src[srcPitch + 2] << 8) |
+ (src[srcPitch * 2] << 16) |
+ (src[(srcPitch * 2) + 1] << 24);
+ dst[2] = src[(srcPitch * 2) + 2] | (src[srcPitch * 3] << 8) |
+ (src[(srcPitch * 3) + 1] << 16) |
+ (src[(srcPitch * 3) + 2] << 24);
+ dst += 3;
+ src += srcPitch * 4;
+ }
+ srcPtr += pS3->rotate * 3;
+ dstPtr += dstPitch;
+ }
+
+ pbox++;
+ }
+}
+
+void
+S3RefreshArea32(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
+{
+ S3Ptr pS3 = S3PTR(pScrn);
+ int count, width, height, dstPitch, srcPitch;
+ CARD32 *dstPtr, *srcPtr, *src, *dst;
+
+ dstPitch = pScrn->displayWidth;
+ srcPitch = -pS3->rotate * pS3->ShadowPitch >> 2;
+
+ while(num--) {
+ width = pbox->x2 - pbox->x1;
+ height = pbox->y2 - pbox->y1;
+
+ if(pS3->rotate == 1) {
+ dstPtr = (CARD32*)pS3->FBBase +
+ (pbox->x1 * dstPitch) + pScrn->virtualX - pbox->y2;
+ srcPtr = (CARD32*)pS3->ShadowPtr +
+ ((1 - pbox->y2) * srcPitch) + pbox->x1;
+ } else {
+ dstPtr = (CARD32*)pS3->FBBase +
+ ((pScrn->virtualY - pbox->x2) * dstPitch) + pbox->y1;
+ srcPtr = (CARD32*)pS3->ShadowPtr +
+ (pbox->y1 * srcPitch) + pbox->x2 - 1;
+ }
+
+ while(width--) {
+ src = srcPtr;
+ dst = dstPtr;
+ count = height;
+ while(count--) {
+ *(dst++) = *src;
+ src += srcPitch;
+ }
+ srcPtr += pS3->rotate;
+ dstPtr += dstPitch;
+ }
+
+ pbox++;
+ }
+}
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-0.6.1/src/s3_video.c new/xf86-video-s3-0.6.2/src/s3_video.c
--- old/xf86-video-s3-0.6.1/src/s3_video.c 2008-12-22 06:24:47.000000000 +0100
+++ new/xf86-video-s3-0.6.2/src/s3_video.c 2009-05-27 23:31:49.000000000 +0200
@@ -289,9 +289,25 @@
if (exit) {
SET_FIFO_CNTL(0x00080000 | FIFO_PS24_SS0);
- if (pPriv->videoStatus & CLIENT_VIDEO_ON)
+ if (pPriv->videoStatus & CLIENT_VIDEO_ON) {
+ WaitVSync();
+ SET_SSTREAM_CNTL(0x03000000);
+ SET_SSTREAM_FBADDR0(0x00000000);
+ SET_SSTREAM_FBADDR1(0x00000000);
+ SET_SSTREAM_STRIDE(0x00000001);
+ SET_SSTREAM_START(0x07ff07ff);
+ SET_SSTREAM_WIND(0x00010001);
+
+ SET_CHROMA_KEY(0x00000000);
+ SET_SSTRETCH(0x00000000);
+ SET_OPAQUE_OVERLAY(0x40000000);
+ SET_K1_VSCALE(0x00000000);
+ SET_K2_VSCALE(0x00000000);
+ SET_DDA_VERT(0x00000000);
SET_BLEND_CNTL(0x01000000);
-
+ WaitVSync();
+ }
+
if (pPriv->area) {
xf86FreeOffscreenLinear(pPriv->area);
pPriv->area = NULL;
@@ -353,7 +369,7 @@
S3PortPrivPtr pPriv = pS3->portPrivate;
INT32 x1, x2, y1, y2;
CARD8 *dst_start;
- int pitch, new_h, offset, offsetV = 0, offsetU = 0;
+ int offset, offsetV = 0, offsetU = 0;
int srcPitch, srcPitchUV = 0, dstPitch, dstSize;
int top, bottom, right, left, npixels, nlines;
BoxRec dstBox;
++++++ xf86-video-s3virge-1.10.2.tar.bz2 -> xf86-video-s3virge-1.10.3.tar.bz2 ++++++
++++ 55417 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-s3virge-1.10.2/README new/xf86-video-s3virge-1.10.3/README
--- old/xf86-video-s3virge-1.10.2/README 2008-03-10 02:32:48.000000000 +0100
+++ new/xf86-video-s3virge-1.10.3/README 2009-05-08 17:27:05.000000000 +0200
@@ -1,4 +1,25 @@
+xf86-video-s3virge - S3 ViRGE video driver for the Xorg X server
+Please submit bugs & patches to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/driver/xf86-video-s3virge
+
+ http://cgit.freedesktop.org/xorg/driver/xf86-video-s3virge
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
+
+------------------------------------------------------------------------
What works:
- Supports 8bpp, 15/16bpp, 24bpp and 32bpp. Heavy testing on ViRGE DX.
- There is some known instability in ViRGE GX2, please report problems.
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-s3virge-1.10.2/config.h.in new/xf86-video-s3virge-1.10.3/config.h.in
--- old/xf86-video-s3virge-1.10.2/config.h.in 2008-12-22 06:36:00.000000000 +0100
+++ new/xf86-video-s3virge-1.10.3/config.h.in 2009-07-02 17:36:29.000000000 +0200
@@ -32,6 +32,10 @@
/* Define to 1 if you have the header file. */
#undef HAVE_UNISTD_H
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
/* Name of package */
#undef PACKAGE
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-s3virge-1.10.2/configure.ac new/xf86-video-s3virge-1.10.3/configure.ac
--- old/xf86-video-s3virge-1.10.2/configure.ac 2008-12-22 06:35:13.000000000 +0100
+++ new/xf86-video-s3virge-1.10.3/configure.ac 2009-07-02 17:36:10.000000000 +0200
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-s3virge],
- 1.10.2,
+ 1.10.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-s3virge)
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-s3virge-1.10.2/man/s3virge.man new/xf86-video-s3virge-1.10.3/man/s3virge.man
--- old/xf86-video-s3virge-1.10.2/man/s3virge.man 2008-03-10 02:32:48.000000000 +0100
+++ new/xf86-video-s3virge-1.10.3/man/s3virge.man 2009-05-08 17:27:05.000000000 +0200
@@ -221,7 +221,7 @@
Enable or disable a cr3a fix added for ViRGE MX. Default: on.
.SH SEE ALSO
-__xservername__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(1), __xconfigfile__(__filemansuffix__), Xserver(1), X(__miscmansuffix__)
.SH KNOWN BUGS
The VideoRam generic driver parameter is presently ignored by the
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-s3virge-1.10.2/src/s3v_driver.c new/xf86-video-s3virge-1.10.3/src/s3v_driver.c
--- old/xf86-video-s3virge-1.10.2/src/s3v_driver.c 2008-12-22 06:23:36.000000000 +0100
+++ new/xf86-video-s3virge-1.10.3/src/s3v_driver.c 2009-05-28 20:21:05.000000000 +0200
@@ -252,101 +252,6 @@
{-1, NULL, OPTV_NONE, {0}, FALSE}
};
-
-/*
- * Lists of symbols that may/may not be required by this driver.
- * This allows the loader to know which ones to issue warnings for.
- *
- * Note that vgahwSymbols and xaaSymbols are referenced outside the
- * XFree86LOADER define in later code, so are defined outside of that
- * define here also.
- */
-
-static const char *vgahwSymbols[] = {
- "vgaHWBlankScreen",
- "vgaHWCopyReg",
- "vgaHWGetHWRec",
- "vgaHWGetIOBase",
- "vgaHWGetIndex",
- "vgaHWInit",
- "vgaHWLock",
- "vgaHWMapMem",
- "vgaHWProtect",
- "vgaHWRestore",
- "vgaHWSave",
- "vgaHWSaveScreen",
- "vgaHWSetMmioFuncs",
- "vgaHWSetStdFuncs",
- "vgaHWUnmapMem",
- "vgaHWddc1SetSpeedWeak",
- /* not used by ViRGE (at the moment :( ) */
- /*
- "vgaHWUnlock",
- "vgaHWFreeHWRec",
- */
- NULL
-};
-
-static const char *xaaSymbols[] = {
- "XAAGetCopyROP",
- "XAAGetCopyROP_PM",
- "XAADestroyInfoRec",
- "XAACreateInfoRec",
- "XAAHelpPatternROP",
- "XAAHelpSolidROP",
- "XAAInit",
- NULL
-};
-
-static const char *ramdacSymbols[] = {
- "xf86CreateCursorInfoRec",
- "xf86InitCursor",
-#if 0
- "xf86DestroyCursorInfoRec",
-#endif
- NULL
-};
-
-static const char *ddcSymbols[] = {
- "xf86PrintEDID",
- "xf86DoEDID_DDC1",
- "xf86DoEDID_DDC2",
- "xf86SetDDCproperties",
- NULL
-};
-
-static const char *i2cSymbols[] = {
- "xf86CreateI2CBusRec",
- "xf86I2CBusInit",
- NULL
-};
-
-static const char *shadowSymbols[] = {
- "ShadowFBInit",
- NULL
-};
-
-static const char *vbeSymbols[] = {
- "VBEInit",
- "vbeDoEDID",
- "vbeFree",
- NULL
-};
-
-static const char *fbSymbols[] = {
- "fbPictureInit",
- "fbScreenInit",
- NULL
-};
-
-#if USE_INT10
-static const char *int10Symbols[] = {
- "xf86InitInt10",
- "xf86FreeInt10",
- NULL
-};
-#endif
-
#ifdef XFree86LOADER
static MODULESETUPPROTO(s3virgeSetup);
@@ -387,22 +292,6 @@
xf86AddDriver(&S3VIRGE, module, 0);
/*
- * Modules that this driver always requires can be loaded here
- * by calling LoadSubModule().
- */
-
- /*
- * Tell the loader about symbols from other modules that this module
- * might refer to.
- */
- LoaderRefSymLists(vgahwSymbols, xaaSymbols, ramdacSymbols,
- ddcSymbols, i2cSymbols,
-#if USE_INT10
- int10Symbols,
-#endif
- vbeSymbols, shadowSymbols, fbSymbols, NULL);
-
- /*
* The return value must be non-NULL on success even though there
* is no TearDownProc.
*/
@@ -616,8 +505,6 @@
if (!xf86LoadSubModule(pScrn, "vgahw"))
return FALSE;
- xf86LoaderReqSymLists(vgahwSymbols, NULL);
-
/*
* Allocate a vgaHWRec
*/
@@ -908,7 +795,6 @@
#if USE_INT10
if (xf86LoadSubModule(pScrn, "int10")) {
xf86Int10InfoPtr pInt;
- xf86LoaderReqSymLists(int10Symbols, NULL);
#if 1
xf86DrvMsg(pScrn->scrnIndex,X_INFO,"initializing int10\n");
pInt = xf86InitInt10(pEnt->index);
@@ -917,7 +803,6 @@
}
#endif
if (xf86LoadSubModule(pScrn, "vbe")) {
- xf86LoaderReqSymLists(vbeSymbols, NULL);
ps3v->pVbe = VBEInit(NULL,pEnt->index);
}
@@ -1032,7 +917,6 @@
if (xf86LoadSubModule(pScrn, "ddc")) {
xf86MonPtr pMon = NULL;
- xf86LoaderReqSymLists(ddcSymbols, NULL);
if ((ps3v->pVbe)
&& ((pMon = xf86PrintEDID(vbeDoEDID(ps3v->pVbe, NULL))) != NULL))
xf86SetDDCproperties(pScrn,pMon);
@@ -1427,7 +1311,6 @@
S3VFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(fbSymbols, NULL);
/* Load XAA if needed */
if (!ps3v->NoAccel || ps3v->hwcursor ) {
@@ -1435,7 +1318,6 @@
S3VFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(xaaSymbols, NULL);
}
/* Load ramdac if needed */
@@ -1444,7 +1326,6 @@
S3VFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
if (ps3v->shadowFB) {
@@ -1452,7 +1333,6 @@
S3VFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(shadowSymbols, NULL);
}
/* Setup WAITFIFO() for accel and ModeInit() */
@@ -3890,7 +3770,6 @@
S3VPtr ps3v = S3VPTR(pScrn);
if ( xf86LoadSubModule(pScrn, "i2c") ) {
- xf86LoaderReqSymLists(i2cSymbols,NULL);
if (S3V_I2CInit(pScrn)) {
CARD32 tmp = (INREG(DDC_REG));
OUTREG(DDC_REG,(tmp | 0x13));
++++++ xf86-video-savage-2.2.1.tar.bz2 -> xf86-video-savage-2.3.0.tar.bz2 ++++++
++++ 60062 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-savage-2.2.1/README new/xf86-video-savage-2.3.0/README
--- old/xf86-video-savage-2.2.1/README 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86-video-savage-2.3.0/README 2009-05-08 17:11:04.000000000 +0200
@@ -0,0 +1,20 @@
+xf86-video-savage - S3 Savage video driver for the Xorg X server
+
+Please submit bugs & patches to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/driver/xf86-video-savage
+
+ http://cgit.freedesktop.org/xorg/driver/xf86-video-savage
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
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-savage-2.2.1/config.h.in new/xf86-video-savage-2.3.0/config.h.in
--- old/xf86-video-savage-2.2.1/config.h.in 2008-05-21 22:05:13.000000000 +0200
+++ new/xf86-video-savage-2.3.0/config.h.in 2009-07-02 17:38:58.000000000 +0200
@@ -32,6 +32,13 @@
/* Define to 1 if you have the header file. */
#undef HAVE_UNISTD_H
+/* Have xf86XVFillKeyHelperDrawable prototype */
+#undef HAVE_XV_DRAWABLE_HELPER
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
/* Name of package */
#undef PACKAGE
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-savage-2.2.1/configure.ac new/xf86-video-savage-2.3.0/configure.ac
--- old/xf86-video-savage-2.2.1/configure.ac 2008-05-21 22:04:23.000000000 +0200
+++ new/xf86-video-savage-2.3.0/configure.ac 2009-07-02 17:38:34.000000000 +0200
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-savage],
- 2.2.1,
+ 2.3.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-savage)
@@ -100,6 +100,10 @@
AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
[XSERVER_LIBPCIACCESS=yes], [XSERVER_LIBPCIACCESS=no],
[#include "xorg-server.h"])
+AC_CHECK_DECL(xf86XVFillKeyHelperDrawable,
+ [AC_DEFINE(HAVE_XV_DRAWABLE_HELPER, 1, [Have xf86XVFillKeyHelperDrawable prototype])],
+ [],
+ [#include "xf86xv.h"])
CFLAGS="$save_CFLAGS"
if test "x$XSERVER_LIBPCIACCESS" = xyes; then
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-savage-2.2.1/man/savage.man new/xf86-video-savage-2.3.0/man/savage.man
--- old/xf86-video-savage-2.2.1/man/savage.man 2008-03-19 15:31:06.000000000 +0100
+++ new/xf86-video-savage-2.3.0/man/savage.man 2009-05-28 21:16:34.000000000 +0200
@@ -139,6 +139,13 @@
Use of the BIOS is required for dualhead operation.
Default: on (use the BIOS).
.TP
+.BI "Option \*qIgnoreEDID\*q \*q" boolean \*q
+Do not use EDID data for mode validation, but DDC is still used
+for monitor detection. This is different from NoDDC option.
+.br
+The default value is
+.B off.
+.TP
.BI "Option \*qShadowStatus\*q \*q" boolean \*q
Enables the use of a shadow status register. There is a chip bug in the
Savage graphics engine that can cause a bus lock when reading the engine
@@ -162,8 +169,30 @@
.BI "Option \*qBCIforXv\*q \*q" boolean \*q
Use the BCI to copy and reformat Xv pixel data. Using the BCI for Xv causes
graphics artifacts on some chips. This option only applies to Savage4 and
-prosavage/twister chips. Default: on for prosavage and twister (use BCI for Xv);
-off for savage4 (do not use the BCI for Xv).
+prosavage/twister chips. On some combinations of chipsets and video players,
+BCI formatting might actually be slower than software formatting (\*qAGPforXv\*q
+might help in this case). BCI formatting can only be used on video data with
+a width that is a multiple of 16 pixels (which is the vast majority of videos).
+Other widths are handled through software formatting. Default: on for prosavage
+and twister (use BCI for Xv); off for savage4 (do not use the BCI for Xv).
+.TP
+.BI "Option \*qAGPforXv\*q \*q" boolean \*q
+Instructs the BCI Xv pixel formatter to use AGP memory as a scratch buffer.
+Ordinarily the BCI formatter uses a an area in framebuffer memory to hold
+YV12 planar data to be converted for display. This requires a somewhat expensive
+upload of YV12 data to framebuffer memory. The \*qAGPforXv\*q option causes the BCI
+formatter to place the YV12 data in AGP memory instead, which can be uploaded
+faster than the framebuffer. Use of this option cuts upload overhead by 25%
+according to benchmarks. This option also smooths out most of the shearing
+present when using BCI for pixel conversion. Currently this option is
+.B experimental
+and is disabled by default. Video width restrictions that apply to \*qBCIforXv\*q
+also apply here. Only valid when \*qDRI\*q and \*qBCIforXv\*q are both active,
+and only on AGP chipsets. Default: \*qoff\*q.
+.br
+If \*qAccelMethod\*q is set to \*qEXA\*q and \*qAGPforXv\*q is enabled, then the
+driver will also attempt to reuse the AGP scratch buffer for UploadToScreen
+acceleration.
.TP
.BI "Option \*qAGPMode\*q \*q" integer \*q
Set AGP data transfer rate.
@@ -228,7 +257,7 @@
.SH FILES
savage_drv.o
.SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
.SH AUTHORS
Authors include Tim Roberts (timr@probo.com) and Ani Joshi (ajoshi@unixbox.com)
for this version, and Tim Roberts and S. Marineau for the original driver from
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-savage-2.2.1/src/savage_accel.c new/xf86-video-savage-2.3.0/src/savage_accel.c
--- old/xf86-video-savage-2.2.1/src/savage_accel.c 2008-03-19 20:06:46.000000000 +0100
+++ new/xf86-video-savage-2.3.0/src/savage_accel.c 2009-05-28 21:16:34.000000000 +0200
@@ -1537,6 +1537,32 @@
return SavageXAAInit(pScreen);
}
+int SavageGetCopyROP(int rop) {
+
+ int ALUCopyROP[16] =
+ {
+ 0x00, /*ROP_0 GXclear */
+ 0x88, /*ROP_DSa GXand */
+ 0x44, /*ROP_SDna GXandReverse */
+ 0xCC, /*ROP_S GXcopy */
+ 0x22, /*ROP_DSna GXandInverted */
+ 0xAA, /*ROP_D GXnoop */
+ 0x66, /*ROP_DSx GXxor */
+ 0xEE, /*ROP_DSo GXor */
+ 0x11, /*ROP_DSon GXnor */
+ 0x99, /*ROP_DSxn GXequiv */
+ 0x55, /*ROP_Dn GXinvert*/
+ 0xDD, /*ROP_SDno GXorReverse */
+ 0x33, /*ROP_Sn GXcopyInverted */
+ 0xBB, /*ROP_DSno GXorInverted */
+ 0x77, /*ROP_DSan GXnand */
+ 0xFF, /*ROP_1 GXset */
+ };
+
+ return (ALUCopyROP[rop]);
+
+}
+
/* Routines for debugging. */
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-savage-2.2.1/src/savage_dri.c new/xf86-video-savage-2.3.0/src/savage_dri.c
--- old/xf86-video-savage-2.2.1/src/savage_dri.c 2008-03-19 20:12:29.000000000 +0100
+++ new/xf86-video-savage-2.3.0/src/savage_dri.c 2009-05-28 21:16:34.000000000 +0200
@@ -520,6 +520,15 @@
}
}
+ if (psav->AGPforXv) {
+ pSAVAGEDRIServer->agpXVideo.offset = offset;
+ pSAVAGEDRIServer->agpXVideo.size = 2 * 1024 * 1024; /* Max XV image is 1024x1024x16bpp */
+ offset += pSAVAGEDRIServer->agpXVideo.size;
+ } else {
+ pSAVAGEDRIServer->agpXVideo.offset = 0;
+ pSAVAGEDRIServer->agpXVideo.size = 0;
+ }
+
pSAVAGEDRIServer->agpTextures.offset = offset;
pSAVAGEDRIServer->agpTextures.size = (pSAVAGEDRIServer->agp.size - offset);
@@ -581,6 +590,25 @@
}
}
+ /* XVideo buffer
+ */
+ if (pSAVAGEDRIServer->agpXVideo.size != 0) {
+ if ( drmAddMap( psav->drmFD,
+ pSAVAGEDRIServer->agpXVideo.offset,
+ pSAVAGEDRIServer->agpXVideo.size,
+ DRM_AGP, 0,
+ &pSAVAGEDRIServer->agpXVideo.handle ) < 0 ) {
+ xf86DrvMsg( pScreen->myNum, X_ERROR,
+ "[agp] Could not add agpXVideo, will use framebuffer upload (slower) \n" );
+ pSAVAGEDRIServer->agpXVideo.size = 0;
+ pSAVAGEDRIServer->agpXVideo.handle = 0;
+ } else {
+ xf86DrvMsg( pScreen->myNum, X_INFO,
+ "[agp] agpXVideo handle = 0x%08lx\n",
+ pSAVAGEDRIServer->agpXVideo.handle );
+ }
+ }
+
/* AGP textures
*/
if ( drmAddMap( psav->drmFD,
@@ -1278,6 +1306,12 @@
pSAVAGEDRIServer->aperture.map = NULL;
}
+ if ( pSAVAGEDRIServer->agpXVideo.map ) {
+ drmUnmap( pSAVAGEDRIServer->agpXVideo.map,
+ pSAVAGEDRIServer->agpXVideo.size );
+ pSAVAGEDRIServer->agpXVideo.map = NULL;
+ }
+
if ( pSAVAGEDRIServer->agpTextures.map ) {
drmUnmap( pSAVAGEDRIServer->agpTextures.map,
pSAVAGEDRIServer->agpTextures.size );
@@ -1293,6 +1327,9 @@
if (pSAVAGEDRIServer->aperture.handle)
drmRmMap(psav->drmFD,pSAVAGEDRIServer->registers.handle);
+ if (pSAVAGEDRIServer->agpXVideo.handle)
+ drmRmMap(psav->drmFD,pSAVAGEDRIServer->agpXVideo.handle);
+
if (pSAVAGEDRIServer->agpTextures.handle)
drmRmMap(psav->drmFD,pSAVAGEDRIServer->agpTextures.handle);
@@ -1541,6 +1578,9 @@
psav->AccelInfoRec->NeedToSync = TRUE;
}
+/* Definition in savage_accel.c */
+int SavageGetCopyROP(int rop);
+
static void
SAVAGEDRISetupForScreenToScreenCopy(
ScrnInfoPtr pScrn,
@@ -1554,7 +1594,7 @@
int cmd =0;
cmd = BCI_CMD_RECT | BCI_CMD_DEST_PBD | BCI_CMD_SRC_PBD_COLOR;
- BCI_CMD_SET_ROP( cmd, XAAGetCopyROP(rop) );
+ BCI_CMD_SET_ROP( cmd, SavageGetCopyROP(rop) );
if (transparency_color != -1)
cmd |= BCI_CMD_SEND_COLOR | BCI_CMD_SRC_TRANSPARENT;
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-savage-2.2.1/src/savage_driver.c new/xf86-video-savage-2.3.0/src/savage_driver.c
--- old/xf86-video-savage-2.2.1/src/savage_driver.c 2008-05-21 22:03:25.000000000 +0200
+++ new/xf86-video-savage-2.3.0/src/savage_driver.c 2009-05-28 21:16:34.000000000 +0200
@@ -278,6 +278,7 @@
,OPTION_AGP_SIZE
,OPTION_DRI
,OPTION_IGNORE_EDID
+ ,OPTION_AGP_FOR_XV
} SavageOpts;
@@ -312,6 +313,7 @@
{ OPTION_AGP_MODE, "AGPMode", OPTV_INTEGER, {0}, FALSE },
{ OPTION_AGP_SIZE, "AGPSize", OPTV_INTEGER, {0}, FALSE },
{ OPTION_DRI, "DRI", OPTV_BOOLEAN, {0}, TRUE },
+ { OPTION_AGP_FOR_XV, "AGPforXv", OPTV_BOOLEAN, {0}, FALSE },
#endif
{ -1, NULL, OPTV_NONE, {0}, FALSE }
};
@@ -337,178 +339,6 @@
#endif
};
-
-
-static const char *vgaHWSymbols[] = {
- "vgaHWBlankScreen",
- "vgaHWCopyReg",
- "vgaHWGetHWRec",
- "vgaHWGetIOBase",
- "vgaHWGetIndex",
- "vgaHWInit",
- "vgaHWLock",
- "vgaHWProtect",
- "vgaHWRestore",
- "vgaHWSave",
- "vgaHWSaveScreen",
- "vgaHWSetMmioFuncs",
- "vgaHWSetStdFuncs",
- "vgaHWUnmapMem",
- "vgaHWddc1SetSpeedWeak",
-#if 0
- "vgaHWFreeHWRec",
- "vgaHWMapMem",
- "vgaHWUnlock",
-#endif
- NULL
-};
-
-#ifdef XF86DRI
-static const char *drmSymbols[] = {
- "drmAvailable",
- "drmAddBufs",
- "drmAddMap",
- "drmCtlInstHandler",
- "drmGetInterruptFromBusID",
- "drmFreeVersion",
- "drmGetVersion",
- "drmMap",
- "drmUnmap",
- "drmMapBufs",
- "drmUnmapBufs",
- "drmAgpAcquire",
- "drmAgpRelease",
- "drmAgpEnable",
- "drmAgpAlloc",
- "drmAgpFree",
- "drmAgpBind",
- "drmAgpUnbind",
- "drmAgpGetMode",
- "drmAgpBase",
- "drmAgpSize",
- "drmAgpVendorId",
- "drmAgpDeviceId",
- "drmMGAInitDMA",
- "drmMGACleanupDMA",
- "drmMGAFlushDMA",
- "drmMGAEngineReset",
- NULL
-};
-
-static const char *driSymbols[] = {
- "DRIGetDrawableIndex",
- "DRIFinishScreenInit",
- "DRIDestroyInfoRec",
- "DRICloseScreen",
- "DRIDestroyInfoRec",
- "DRIScreenInit",
- "DRIDestroyInfoRec",
- "DRICreateInfoRec",
- "DRILock",
- "DRIUnlock",
- "DRIGetSAREAPrivate",
- "DRIGetContext",
- "DRIQueryVersion",
- "DRIAdjustFrame",
- "DRIOpenFullScreen",
- "DRICloseFullScreen",
- "GlxSetVisualConfigs",
- NULL
-};
-#endif
-
-
-static const char *ramdacSymbols[] = {
- "xf86CreateCursorInfoRec",
-#if 0
- "xf86DestroyCursorInfoRec",
-#endif
- "xf86InitCursor",
- NULL
-};
-
-static const char *int10Symbols[] = {
- "xf86ExecX86int10",
- "xf86Int10AllocPages",
- "xf86int10Addr",
- "xf86Int10FreePages"
-};
-
-static const char *vbeSymbols[] = {
- "VBEInit",
- "vbeDoEDID",
-#if 0
- "vbeFree",
-#endif
- NULL
-};
-
-static const char *vbeOptSymbols[] = {
- "vbeModeInit",
- "VBESetVBEMode",
- "VBEGetVBEInfo",
- "VBEFreeVBEInfo",
- NULL
-};
-
-static const char *ddcSymbols[] = {
- "xf86DoEDID_DDC1",
- "xf86DoEDID_DDC2",
- "xf86PrintEDID",
- "xf86SetDDCproperties",
- NULL
-};
-
-static const char *i2cSymbols[] = {
- "xf86CreateI2CBusRec",
- "xf86I2CBusInit",
- "xf86CreateI2CDevRec",
- "xf86I2CDevInit",
- "xf86I2CWriteByte",
- "xf86I2CWriteBytes",
- "xf86I2CReadByte",
- "xf86I2CReadBytes",
- "xf86I2CWriteRead",
- "xf86DestroyI2CDevRec",
- NULL
-};
-
-static const char *xaaSymbols[] = {
- "XAAGetCopyROP",
- "XAAGetCopyROP_PM",
- "XAACreateInfoRec",
- "XAADestroyInfoRec",
- "XAAFillSolidRects",
- "XAAHelpPatternROP",
- "XAAHelpSolidROP",
- "XAAInit",
- "XAAScreenIndex",
- NULL
-};
-
-static const char *exaSymbols[] = {
- "exaDriverAlloc",
- "exaDriverInit",
- "exaDriverFini",
- "exaOffscreenAlloc",
- "exaOffscreenFree",
- "exaGetPixmapOffset",
- "exaGetPixmapPitch",
- "exaGetPixmapSize",
- NULL
-};
-
-static const char *shadowSymbols[] = {
- "ShadowFBInit",
- NULL
-};
-
-static const char *fbSymbols[] = {
- "fbPictureInit",
- "fbScreenInit",
- NULL
-};
-
#ifdef XFree86LOADER
static MODULESETUPPROTO(SavageSetup);
@@ -540,14 +370,6 @@
if (!setupDone) {
setupDone = TRUE;
xf86AddDriver(&SAVAGE, module, 1);
- LoaderRefSymLists(vgaHWSymbols, fbSymbols, ramdacSymbols,
- xaaSymbols,
- exaSymbols,
- shadowSymbols, vbeSymbols, vbeOptSymbols,
-#ifdef XF86DRI
- drmSymbols, driSymbols,
-#endif
- int10Symbols, i2cSymbols, ddcSymbols, NULL);
return (pointer) 1;
} else {
if (errmaj)
@@ -1050,7 +872,6 @@
/* Do the DDC dance. */ /* S3/VIA's DDC code */
ddc = xf86LoadSubModule(pScrn, "ddc");
if (ddc) {
- xf86LoaderReqSymLists(ddcSymbols, NULL);
switch( psav->Chipset ) {
case S3_SAVAGE3D:
case S3_SAVAGE_MX:
@@ -1072,7 +893,6 @@
if (!SavageDDC1(pScrn->scrnIndex)) {
/* DDC1 failed,switch to DDC2 */
if (xf86LoadSubModule(pScrn, "i2c")) {
- xf86LoaderReqSymLists(i2cSymbols,NULL);
if (SavageI2CInit(pScrn)) {
unsigned char tmp;
xf86MonPtr pMon;
@@ -1274,7 +1094,6 @@
if (!xf86LoadSubModule(pScrn, "vgahw"))
return FALSE;
- xf86LoaderReqSymLists(vgaHWSymbols, NULL);
if (!vgaHWGetHWRec(pScrn))
return FALSE;
@@ -1577,7 +1396,6 @@
psav->EntityIndex = pEnt->index;
if (xf86LoadSubModule(pScrn, "vbe")) {
- xf86LoaderReqSymLists(vbeSymbols, NULL);
psav->pVbe = VBEInit(NULL, pEnt->index);
}
@@ -1870,6 +1688,20 @@
"%s DVI port support (Savage4 only)\n",(psav->dvi?"Force":"Disable"));
}
+ psav->AGPforXv = FALSE;
+#ifdef XF86DRI
+ if (xf86GetOptValBool(psav->Options, OPTION_AGP_FOR_XV, &psav->AGPforXv)) {
+ if (psav->AGPforXv) {
+ if (psav->agpSize == 0) {
+ psav->AGPforXv = FALSE;
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "AGP not available, cannot use AGP for Xv\n");
+ }
+ }
+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+ "Option: %s use of AGP buffer for Xv\n",(psav->AGPforXv?"Enable":"Disable"));
+ }
+#endif
+
/* Add more options here. */
@@ -2190,10 +2022,11 @@
/* Check LCD panel information */
if(psav->DisplayType == MT_LCD)
- {
SavageGetPanelInfo(pScrn);
+
+ /* DisplayType will be reset if panel is not active */
+ if(psav->DisplayType == MT_LCD)
SavageAddPanelMode(pScrn);
- }
#if 0
if (psav->CrtOnly && !psav->UseBIOS) {
@@ -2296,16 +2129,11 @@
return FALSE;
}
- xf86LoaderReqSymLists(fbSymbols, NULL);
-
if( !psav->NoAccel ) {
-
char *modName = NULL;
- const char **symNames = NULL;
if (psav->useEXA) {
modName = "exa";
- symNames = exaSymbols;
XF86ModReqInfo req;
int errmaj, errmin;
memset(&req, 0, sizeof(req));
@@ -2322,7 +2150,6 @@
}
} else {
modName = "xaa";
- symNames = xaaSymbols;
if( !xf86LoadSubModule(pScrn, modName) ) {
SavageFreeRec(pScrn);
vbeFree(psav->pVbe);
@@ -2330,9 +2157,6 @@
return FALSE;
}
}
-
- xf86LoaderReqSymLists(symNames, NULL );
-
}
if (psav->hwcursor) {
@@ -2342,7 +2166,6 @@
psav->pVbe = NULL;
return FALSE;
}
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
if (psav->shadowFB) {
@@ -2352,7 +2175,6 @@
psav->pVbe = NULL;
return FALSE;
}
- xf86LoaderReqSymLists(shadowSymbols, NULL);
}
vbeFree(psav->pVbe);
@@ -3678,6 +3500,11 @@
else
xf86DrvMsg(pScrn->scrnIndex,X_CONFIG,"XvMC is not enabled\n");
}
+
+ if (!psav->directRenderingEnabled && psav->AGPforXv) {
+ xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"AGPforXV requires DRI to be enabled.\n");
+ psav->AGPforXv = FALSE;
+ }
#endif
if (serverGeneration == 1)
@@ -4718,7 +4545,6 @@
vbeInfoPtr pVbe;
if (xf86LoadSubModule(pScrn, "vbe")) {
- xf86LoaderReqSymLists(vbeSymbols, NULL);
pVbe = VBEInit(NULL, index);
ConfiguredMonitor = vbeDoEDID(pVbe, NULL);
vbeFree(pVbe);
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-savage-2.2.1/src/savage_driver.h new/xf86-video-savage-2.3.0/src/savage_driver.h
--- old/xf86-video-savage-2.2.1/src/savage_driver.h 2008-03-19 15:31:06.000000000 +0100
+++ new/xf86-video-savage-2.3.0/src/savage_driver.h 2009-05-08 17:11:04.000000000 +0200
@@ -136,6 +136,9 @@
/* command DMA */
drmRegion cmdDma;
+
+ /* XVideo through AGP */
+ drmRegion agpXVideo;
} SAVAGEDRIServerPrivateRec, *SAVAGEDRIServerPrivatePtr;
#endif
@@ -486,6 +489,7 @@
Bool bDisableXvMC;
+ Bool AGPforXv;
#endif
Bool disableCOB;
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-savage-2.2.1/src/savage_exa.c new/xf86-video-savage-2.3.0/src/savage_exa.c
--- old/xf86-video-savage-2.2.1/src/savage_exa.c 2008-05-21 22:03:25.000000000 +0200
+++ new/xf86-video-savage-2.3.0/src/savage_exa.c 2009-05-28 21:16:34.000000000 +0200
@@ -69,31 +69,8 @@
#define GXset 0xFF
#endif
-static int SavageGetCopyROP(int rop) {
-
- int ALUCopyROP[16] =
- {
- 0x00, /*ROP_0 GXclear */
- 0x88, /*ROP_DSa GXand */
- 0x44, /*ROP_SDna GXandReverse */
- 0xCC, /*ROP_S GXcopy */
- 0x22, /*ROP_DSna GXandInverted */
- 0xAA, /*ROP_D GXnoop */
- 0x66, /*ROP_DSx GXxor */
- 0xEE, /*ROP_DSo GXor */
- 0x11, /*ROP_DSon GXnor */
- 0x99, /*ROP_DSxn GXequiv */
- 0x55, /*ROP_Dn GXinvert*/
- 0xDD, /*ROP_SDno GXorReverse */
- 0x33, /*ROP_Sn GXcopyInverted */
- 0xBB, /*ROP_DSno GXorInverted */
- 0x77, /*ROP_DSan GXnand */
- 0xFF, /*ROP_1 GXset */
- };
-
- return (ALUCopyROP[rop]);
-
-}
+/* Definition moved to savage_accel.c */
+int SavageGetCopyROP(int rop);
static int SavageGetSolidROP(int rop) {
@@ -382,7 +359,7 @@
/*ErrorF("in preparecopy\n");*/
- cmd = BCI_CMD_RECT | BCI_CMD_DEST_PBD_NEW | BCI_CMD_SRC_SBD_COLOR_NEW;
+ cmd = BCI_CMD_RECT | BCI_CMD_DEST_PBD | BCI_CMD_SRC_SBD_COLOR;
BCI_CMD_SET_ROP( cmd, SavageGetCopyROP(alu) );
@@ -397,18 +374,23 @@
psav->SavedBciCmd = cmd;
- psav->WaitQueue(psav,7);
+ psav->WaitQueue(psav,8);
BCI_SEND(BCI_SET_REGISTER
| BCI_SET_REGISTER_COUNT(1)
| BCI_BITPLANE_WRITE_MASK);
BCI_SEND(planemask);
- BCI_SEND(psav->SavedBciCmd);
/* src */
+ BCI_SEND(BCI_SET_REGISTER
+ | BCI_SET_REGISTER_COUNT(2)
+ | BCI_SBD_1);
BCI_SEND(psav->sbd_offset);
BCI_SEND(psav->sbd_high);
/* dst */
+ BCI_SEND(BCI_SET_REGISTER
+ | BCI_SET_REGISTER_COUNT(2)
+ | BCI_PBD_1);
BCI_SEND(psav->pbd_offset);
BCI_SEND(psav->pbd_high);
@@ -437,7 +419,8 @@
height ++;
}
- psav->WaitQueue(psav,4);
+ psav->WaitQueue(psav,5);
+ BCI_SEND(psav->SavedBciCmd);
BCI_SEND(BCI_X_Y(srcX, srcY));
BCI_SEND(BCI_X_Y(dstX, dstY));
BCI_SEND(BCI_W_H(width, height));
@@ -457,10 +440,73 @@
BCI_GET_PTR;
int i, j, dwords, queue, Bpp;
unsigned int cmd;
- CARD32 * srcp;
+ CARD32 * srcp;
+ unsigned int dst_pitch;
+ unsigned int dst_yoffset;
+ int agp_possible;
+ exaWaitSync(pDst->drawable.pScreen);
+
Bpp = pDst->drawable.bitsPerPixel / 8;
+ /* Test for conditions for AGP Mastered Image Transfer (MIT). AGP memory
+ needs to be available, the XVideo AGP needs to be enabled, the
+ framebuffer destination must be a multiple of 32 bytes, and the source
+ pitch must span the entirety of the destination pitch. This last
+ condition allows the code to consider this upload as equivalent to a
+ plain memcpy() call. */
+ dst_pitch = exaGetPixmapPitch(pDst);
+ dst_yoffset = exaGetPixmapOffset(pDst) + y * dst_pitch;
+ agp_possible =
+ (!psav->IsPCI && psav->drmFD > 0 && psav->DRIServerInfo != NULL &&
+ psav->DRIServerInfo->agpXVideo.size > 0 &&
+ x == 0 && src_pitch == dst_pitch && w * Bpp == dst_pitch &&
+ (dst_yoffset & 0x1f) == 0);
+
+ if (agp_possible) {
+ SAVAGEDRIServerPrivatePtr pSAVAGEDRIServer = psav->DRIServerInfo;
+ if (pSAVAGEDRIServer->agpXVideo.map != NULL ||
+ 0 <= drmMap( psav->drmFD,
+ pSAVAGEDRIServer->agpXVideo.handle,
+ pSAVAGEDRIServer->agpXVideo.size,
+ &pSAVAGEDRIServer->agpXVideo.map)) {
+
+ unsigned char * agpMap = pSAVAGEDRIServer->agpXVideo.map;
+ unsigned int agpOffset = drmAgpBase(psav->drmFD) + pSAVAGEDRIServer->agpXVideo.offset;
+ unsigned int bytesTotal = dst_pitch * h;
+
+ while (bytesTotal > 0) {
+ unsigned int bytesTransfer =
+ (bytesTotal > pSAVAGEDRIServer->agpXVideo.size)
+ ? pSAVAGEDRIServer->agpXVideo.size
+ : bytesTotal;
+ unsigned int qwordsTransfer = bytesTransfer >> 3;
+
+ /* Copy source into AGP buffer */
+ memcpy(agpMap, src, bytesTransfer);
+
+ psav->WaitQueue(psav,6);
+ BCI_SEND(BCI_SET_REGISTER | BCI_SET_REGISTER_COUNT(2) | 0x51);
+ BCI_SEND(agpOffset | 3); /* Source buffer in AGP memory */
+ BCI_SEND(dst_yoffset); /* Destination buffer in framebuffer */
+
+ BCI_SEND(BCI_SET_REGISTER | BCI_SET_REGISTER_COUNT(1) | 0x50);
+ BCI_SEND(0x00000002 | ((qwordsTransfer - 1) << 3)); /* Select MIT, sysmem to framebuffer */
+
+ /* I want to wait here for any reads from AGP memory and any
+ framebuffer writes performed by the MIT to stop. */
+ BCI_SEND(0xC0000000 | ((0x08 | 0x01) << 16));
+
+ bytesTotal -= bytesTransfer;
+ src += bytesTransfer;
+ dst_yoffset += bytesTransfer;
+ }
+ exaMarkSync(pDst->drawable.pScreen);
+ return TRUE;
+ }
+ }
+
+ /* If we reach here, AGP transfer is not possible, or failed to drmMap() */
psav->sbd_offset = exaGetPixmapOffset(pDst);
psav->sbd_high = SavageSetBD(psav, pDst);
@@ -489,19 +535,27 @@
dwords = (((w * Bpp) + 3) >> 2);
for (i = 0; i < h; i++) {
srcp = (CARD32 *)src;
- for (j = 0; j < dwords; j++) {
- if (queue < 4) {
- BCI_RESET;
- queue = 120 * 1024;
+
+ if (4 * dwords <= queue) {
+ /* WARNING: breaking BCI_PTR abstraction here */
+ memcpy(bci_ptr, srcp, 4 * dwords);
+ bci_ptr += dwords;
+ queue -= 4 * dwords;
+ } else {
+ for (j = 0; j < dwords; j++) {
+ if (queue < 4) {
+ BCI_RESET;
+ queue = 120 * 1024;
+ }
+ BCI_SEND(*srcp++);
+ queue -= 4;
}
- BCI_SEND(*srcp++);
- queue -= 4;
}
src += src_pitch;
}
/*exaWaitSync(pDst->drawable.pScreen);*/
-
+ exaMarkSync(pDst->drawable.pScreen);
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-savage-2.2.1/src/savage_video.c new/xf86-video-savage-2.3.0/src/savage_video.c
--- old/xf86-video-savage-2.2.1/src/savage_video.c 2008-03-19 15:31:06.000000000 +0100
+++ new/xf86-video-savage-2.3.0/src/savage_video.c 2009-05-28 21:16:34.000000000 +0200
@@ -241,9 +241,16 @@
Time freeTime;
int lastKnownPitch;
- int size;
- void *video_memory;
- int video_offset;
+ void *video_memory; /* opaque memory management information structure */
+ CARD32 video_offset; /* offset in video memory of packed YUV buffer */
+
+ void *video_planarmem; /* opaque memory management information structure */
+ CARD32 video_planarbuf; /* offset in video memory of planar YV12 buffer */
+
+ Bool tried_agp; /* TRUE if AGP allocation has been tried */
+ CARD32 agpBase; /* Physical address of aperture base */
+ CARD32 agpBufferOffset; /* Offset of buffer in AGP memory, or 0 if unavailable */
+ drmAddress agpBufferMap; /* Mapping of AGP buffer in process memory, or NULL */
} SavagePortPrivRec, *SavagePortPrivPtr;
@@ -1028,7 +1035,8 @@
SavageStopVideo(ScrnInfoPtr pScrn, pointer data, Bool shutdown)
{
SavagePortPrivPtr pPriv = (SavagePortPrivPtr)data;
- /*SavagePtr psav = SAVPTR(pScrn); */
+ SavagePtr psav = SAVPTR(pScrn);
+ ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex];
xf86ErrorFVerb(XVTRACE,"SavageStopVideo\n");
@@ -1037,11 +1045,29 @@
if(shutdown) {
/*SavageClipVWindow(pScrn);*/
SavageStreamsOff( pScrn );
+
+ if (pPriv->agpBufferMap != NULL) {
+ SAVAGEDRIServerPrivatePtr pSAVAGEDRIServer = psav->DRIServerInfo;
+
+ /* agpXVideo is reused to implement UploadToScreen in EXA */
+ if (!psav->useEXA) {
+ drmUnmap(pPriv->agpBufferMap, pSAVAGEDRIServer->agpXVideo.size);
+ pSAVAGEDRIServer->agpXVideo.map = NULL;
+ }
+ pPriv->agpBufferMap = NULL;
+ pPriv->agpBufferOffset = 0;
+ }
+
if (pPriv->video_memory != NULL) {
SavageFreeMemory(pScrn, pPriv->video_memory);
pPriv->video_memory = NULL;
}
+ if (pPriv->video_planarmem != NULL) {
+ SavageFreeMemory(pScrn, pPriv->video_planarmem);
+ pPriv->video_planarmem = NULL;
+ }
pPriv->videoStatus = 0;
+ pPriv->tried_agp = FALSE;
} else {
if(pPriv->videoStatus & CLIENT_VIDEO_ON) {
pPriv->videoStatus |= OFF_TIMER;
@@ -1170,34 +1196,37 @@
unsigned char *srcV, /* V */
unsigned char *srcU, /* U */
unsigned char *dst,
+ unsigned char * planarPtr,
+ unsigned long planarOffset,
int srcPitch, int srcPitch2,
int dstPitch,
- int h,int w)
+ int h,int w,
+ Bool isAGP)
{
SavagePtr psav = SAVPTR(pScrn);
- /* half of the dest buffer for copying the YVU data to it ??? */
- unsigned char *dstCopy = (unsigned char *)(((unsigned long)dst
- + dstPitch * h
- + 0x0f) & ~0x0f);
+
/* for pixel transfer */
- unsigned long offsetY = (unsigned long)dstCopy - (unsigned long)psav->FBBase;
+ unsigned long offsetY = planarOffset;
unsigned long offsetV = offsetY + srcPitch * h;
unsigned long offsetU = offsetV + srcPitch2 * (h>>1);
unsigned long dstOffset = (unsigned long)dst - (unsigned long)psav->FBBase;
int i;
+ unsigned char memType;
BCI_GET_PTR;
/* copy Y planar */
- memcpy(dstCopy, srcY, srcPitch * h);
+ memcpy(planarPtr, srcY, srcPitch * h);
/* copy V planar */
- dstCopy = dstCopy + srcPitch * h;
- memcpy(dstCopy, srcV, srcPitch2 * (h>>1));
+ planarPtr = planarPtr + srcPitch * h;
+ memcpy(planarPtr, srcV, srcPitch2 * (h>>1));
/* copy U planar */
- dstCopy = dstCopy + srcPitch2 * (h>>1);
- memcpy(dstCopy, srcU, srcPitch2 * (h>>1));
+ planarPtr = planarPtr + srcPitch2 * (h>>1);
+ memcpy(planarPtr, srcU, srcPitch2 * (h>>1));
+
+ memType = isAGP ? 3 : 0;
/*
* Transfer pixel data from one memory location to another location
@@ -1217,23 +1246,18 @@
w = (w+0xf)&0xff0;
psav->WaitQueue(psav,11);
- BCI_SEND(0x96070051);
- BCI_SEND(offsetY);
-
+ BCI_SEND(BCI_SET_REGISTER | BCI_SET_REGISTER_COUNT(7) | 0x51);
+ BCI_SEND(offsetY | memType);
BCI_SEND(dstOffset);
-
BCI_SEND(((h-1)<<16)|((w-1)>>3));
-
BCI_SEND(dstPitch >> 3);
-
-
- BCI_SEND(offsetU);
- BCI_SEND(offsetV);
-
+ BCI_SEND(offsetU | memType);
+ BCI_SEND(offsetV | memType);
BCI_SEND((srcPitch2 << 16)| srcPitch2);
- BCI_SEND(0x96010050);
+ BCI_SEND(BCI_SET_REGISTER | BCI_SET_REGISTER_COUNT(1) | 0x50);
BCI_SEND(0x00200003 | srcPitch);
+
BCI_SEND(0xC0170000);
}
@@ -1304,6 +1328,8 @@
if (pPriv->video_memory == area)
pPriv->video_memory = NULL;
+ if (pPriv->video_planarmem == area)
+ pPriv->video_planarmem = NULL;
}
static CARD32
@@ -1840,6 +1866,16 @@
#endif
}
+static void
+SavageFillKeyHelper(DrawablePtr pDraw, uint32_t colorKey, RegionPtr clipBoxes)
+{
+#if HAVE_XV_DRAWABLE_HELPER
+ xf86XVFillKeyHelperDrawable(pDraw, colorKey, clipBoxes);
+#else
+ xf86XVFillKeyHelper(pDraw->pScreen, colorKey, clipBoxes);
+#endif
+}
+
static int
SavagePutImage(
ScrnInfoPtr pScrn,
@@ -1860,6 +1896,7 @@
unsigned char *dst_start;
int pitch, new_size, offset, offsetV=0, offsetU=0;
int srcPitch, srcPitch2=0, dstPitch;
+ int planarFrameSize;
int top, left, npixels, nlines;
BoxRec dstBox;
CARD32 tmp;
@@ -1895,8 +1932,8 @@
pitch = pScrn->bitsPerPixel * pScrn->displayWidth >> 3;
+ /* All formats directly displayable by Savage are packed and 2 bytes per pixel */
dstPitch = ((width << 1) + 15) & ~15;
- /*new_h = ((dstPitch * height) + pitch - 1) / pitch;*/
new_size = dstPitch * height;
switch(id) {
@@ -1923,17 +1960,78 @@
break;
}
+ /* Calculate required memory for all planar frames */
+ planarFrameSize = 0;
if (srcPitch2 != 0 && S3_SAVAGE4_SERIES(psav->Chipset) && psav->BCIforXv) {
- new_size = ((new_size + 0xF) & ~0xF) + srcPitch * height + srcPitch2 * height;
+ new_size = ((new_size + 0xF) & ~0xF);
+ planarFrameSize = srcPitch * height + srcPitch2 * height;
}
-/* if(!(pPriv->area = SavageAllocateMemory(pScrn, pPriv->area, new_h)))
- return BadAlloc;*/
- pPriv->video_offset = SavageAllocateMemory(pScrn, &pPriv->video_memory,
- new_size);
+ /* Check whether AGP buffers can be allocated. If not, fall back to ordinary
+ upload to framebuffer (slower) */
+ if (!pPriv->tried_agp && !psav->IsPCI && psav->drmFD > 0 && psav->DRIServerInfo != NULL) {
+ int ret;
+ SAVAGEDRIServerPrivatePtr pSAVAGEDRIServer = psav->DRIServerInfo;
+
+ pPriv->tried_agp = TRUE;
+ if (pSAVAGEDRIServer->agpXVideo.size >= max(new_size, planarFrameSize)) {
+ if (pSAVAGEDRIServer->agpXVideo.map == NULL &&
+ drmMap( psav->drmFD,
+ pSAVAGEDRIServer->agpXVideo.handle,
+ pSAVAGEDRIServer->agpXVideo.size,
+ &pSAVAGEDRIServer->agpXVideo.map ) < 0 ) {
+
+ xf86DrvMsg( pScreen->myNum, X_ERROR, "[agp] XVideo: Could not map agpXVideo \n" );
+ pPriv->agpBufferOffset = 0;
+ pPriv->agpBufferMap = NULL;
+ } else {
+ pPriv->agpBufferMap = pSAVAGEDRIServer->agpXVideo.map;
+ pPriv->agpBufferOffset = pSAVAGEDRIServer->agpXVideo.offset;
+ pPriv->agpBase = drmAgpBase(psav->drmFD);
+#if 0
+ xf86DrvMsg( pScreen->myNum, X_INFO,
+ "[agp] agpXVideo mapped at 0x%08lx aperture=0x%08x offset=0x%08lx\n",
+ (unsigned long)pPriv->agpBufferMap, pPriv->agpBase, pPriv->agpBufferOffset);
+#endif
+ }
+ } else {
+ /* This situation is expected if AGPforXv is disabled, otherwise report. */
+ if (pSAVAGEDRIServer->agpXVideo.size > 0) {
+ xf86DrvMsg( pScreen->myNum, X_ERROR,
+ "[agp] XVideo: not enough space in buffer (got %ld bytes, required %ld bytes).\n",
+ pSAVAGEDRIServer->agpXVideo.size, max(new_size, planarFrameSize));
+ }
+ pPriv->agpBufferMap = NULL;
+ pPriv->agpBufferOffset = 0;
+ }
+ }
+
+
+ /* Buffer for final packed frame */
+ pPriv->video_offset = SavageAllocateMemory(
+ pScrn, &pPriv->video_memory,
+ new_size);
if (pPriv->video_offset == 0)
return BadAlloc;
+ /* Packed format cases */
+ if (planarFrameSize == 0) {
+ pPriv->video_planarbuf = 0;
+
+ /* Planar format cases */
+ } else {
+ /* Hardware-assisted planar conversion only works on 16-byte aligned addresses */
+ pPriv->video_planarbuf = SavageAllocateMemory(
+ pScrn, &pPriv->video_planarmem,
+ ((planarFrameSize + 0xF) & ~0xF));
+ if (pPriv->video_planarbuf != 0) {
+ /* TODO: stop any pending conversions when buffers change... */
+ pPriv->video_planarbuf = ((pPriv->video_planarbuf + 0xF) & ~0xF);
+ } else {
+ /* Fallback using software conversion */
+ }
+ }
+
/* copy data */
top = y1 >> 16;
left = (x1 >> 16) & ~1;
@@ -1941,7 +2039,6 @@
left <<= 1;
offset = (pPriv->video_offset) + (top * dstPitch);
- /*offset = pPriv->area->box.y1 * psav->lDelta;*/
dst_start = (psav->FBBase + ((offset + left) & ~BASE_PAD));
switch(id) {
@@ -1952,13 +2049,30 @@
offsetU += tmp;
offsetV += tmp;
nlines = ((((y2 + 0xffff) >> 16) + 1) & ~1) - top;
- if (S3_SAVAGE4_SERIES(psav->Chipset) && psav->BCIforXv && (npixels & 0xF) == 0) {
- SavageCopyPlanarDataBCI(
- pScrn,
- buf + (top * srcPitch) + (left >> 1),
- buf + offsetV,
- buf + offsetU,
- dst_start, srcPitch, srcPitch2, dstPitch, nlines, npixels);
+ if (S3_SAVAGE4_SERIES(psav->Chipset) && psav->BCIforXv && (npixels & 0xF) == 0 && pPriv->video_planarbuf != 0) {
+ if (pPriv->agpBufferMap != NULL) {
+ /* Using copy to AGP memory */
+ SavageCopyPlanarDataBCI(
+ pScrn,
+ buf + (top * srcPitch) + (left >> 1),
+ buf + offsetV,
+ buf + offsetU,
+ dst_start,
+ pPriv->agpBufferMap,
+ pPriv->agpBase + pPriv->agpBufferOffset,
+ srcPitch, srcPitch2, dstPitch, nlines, npixels, TRUE);
+ } else {
+ /* Using ordinary copy to framebuffer */
+ SavageCopyPlanarDataBCI(
+ pScrn,
+ buf + (top * srcPitch) + (left >> 1),
+ buf + offsetV,
+ buf + offsetU,
+ dst_start,
+ (unsigned char *)psav->FBBase + pPriv->video_planarbuf,
+ pPriv->video_planarbuf,
+ srcPitch, srcPitch2, dstPitch, nlines, npixels, FALSE);
+ }
} else {
SavageCopyPlanarData(
buf + (top * srcPitch) + (left >> 1),
@@ -1988,7 +2102,7 @@
if(!REGION_EQUAL(pScreen, &pPriv->clip, clipBoxes)) {
REGION_COPY(pScreen, &pPriv->clip, clipBoxes);
/* draw these */
- xf86XVFillKeyHelper(pScrn->pScreen, pPriv->colorKey, clipBoxes);
+ SavageFillKeyHelper(pDraw, pPriv->colorKey, clipBoxes);
}
++++++ xf86-video-siliconmotion-1.7.1.tar.bz2 -> xf86-video-siliconmotion-1.7.2.tar.bz2 ++++++
++++ 55093 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-siliconmotion-1.7.1/COPYING new/xf86-video-siliconmotion-1.7.2/COPYING
--- old/xf86-video-siliconmotion-1.7.1/COPYING 2009-03-20 00:26:11.000000000 +0100
+++ new/xf86-video-siliconmotion-1.7.2/COPYING 2009-05-27 23:31:56.000000000 +0200
@@ -1,12 +1,72 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.
+Copyright (C) 2000,2008 Silicon Motion, Inc. All Rights Reserved.
+Copyright (C) 2001 Corvin Zahn. All Rights Reserved.
+Copyright (C) 2008 Francisco Jerez. All Rights Reserved.
+Copyright (C) 2008 Mandriva Linux. All Rights Reserved.
-Please submit updated COPYING files to the Xorg bugzilla:
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-http://lists.freedesktop.org/mailman/listinfo/xorg
+Except as contained in this notice, the names of The XFree86 Project and
+Silicon Motion shall not be used in advertising or otherwise to promote the
+sale, use or other dealings in this Software without prior written
+authorization from The XFree86 Project or Silicon Motion.
+
+******************************************************************************
+
+Copyright 2007 George Sapountzis
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+******************************************************************************
+
+Copyright (C) 2006 Dennis De Winter All Rights Reserved.
+Copyright (C) 2007 Alex Deucher All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
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-siliconmotion-1.7.1/ChangeLog new/xf86-video-siliconmotion-1.7.2/ChangeLog
--- old/xf86-video-siliconmotion-1.7.1/ChangeLog 2009-04-28 22:14:46.000000000 +0200
+++ new/xf86-video-siliconmotion-1.7.2/ChangeLog 2009-07-02 17:43:24.000000000 +0200
@@ -1,3 +1,63 @@
+commit cd9e9f25294abb739c1772e3a9a7a9c0a921ee82
+Author: Francisco Jerez
+Date: Tue Jun 23 13:11:02 2009 +0200
+
+ Fix EXA rotation for SM502 at 32bpp (bug 22432).
+
+commit 97498c048c897e5753e61d3b4ab231025974d67c
+Author: Adam Jackson
+Date: Thu May 28 15:17:58 2009 -0400
+
+ Remove useless loader symbol lists.
+
+commit 536e5df957698251206326edc5a13e833f7c72b1
+Author: Francisco Jerez
+Date: Wed May 27 01:23:36 2009 +0200
+
+ Program MCLK/MXCLK on startup for a secondary SM502.
+
+ This should allow using a SM502 as secondary display
+ device (bug 21810).
+
+commit 6a370fa2b6b8fcbd556dd6f9bf92872e9bea23e8
+Author: Alan Coopersmith
+Date: Mon May 11 22:31:30 2009 -0700
+
+ Fill in COPYING file, add SubmittingPatches URL to README
+
+commit 962e0c4f08180ac51994aef8d6d042108d5841c1
+Author: Francisco Jerez
+Date: Sun May 10 01:53:05 2009 +0200
+
+ Widen the pixel clock readjust interval for SM712.
+
+ Set it to 3MHz so that the pixel clock frequency is overridden
+ when it's found to be 49MHz, which is reported to be unstable.
+
+commit 3cc1b9d4bcf1b7a756ea4426c93392ff6d82e9a6
+Author: Francisco Jerez
+Date: Tue May 5 00:45:10 2009 +0200
+
+ Fail gracefully when the specified virtual screen doesn't fit in RAM.
+
+commit 32628d9884d577d7a672c172c12b7097be276700
+Author: Francisco Jerez
+Date: Tue May 5 00:44:17 2009 +0200
+
+ Probe the amount of installed memory by trial and error on SM712.
+
+ In some cases the BIOS hasn't filled in the "scratchpad registers"
+ (SR71) with the right amount of memory installed (e.g. MIPS
+ platform). There seems to be no other way to do it than to test it.
+
+ This should fix bug 21528.
+
+commit 00921b014fa0b5358c22a769cf2450cbd4bdc8a5
+Author: Francisco Jerez
+Date: Tue Apr 28 22:24:03 2009 +0200
+
+ Bump version to 1.7.1.
+
commit abf1ba79f2bfe61f24cfa43deb0400d7c5f95bd5
Author: Francisco Jerez
Date: Tue Apr 21 21:37:45 2009 +0200
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-siliconmotion-1.7.1/README new/xf86-video-siliconmotion-1.7.2/README
--- old/xf86-video-siliconmotion-1.7.1/README 2009-03-20 00:26:11.000000000 +0100
+++ new/xf86-video-siliconmotion-1.7.2/README 2009-05-27 23:31:56.000000000 +0200
@@ -1,22 +1,25 @@
xf86-video-siliconmotion - Silicon Motion video driver for the Xorg X server
-Please submit bugs & patches to the Xorg bugzilla:
-
- https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
All questions regarding this software should be directed at the
Xorg mailing list:
http://lists.freedesktop.org/mailman/listinfo/xorg
+Please submit bug reports to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
The master development code repository can be found at:
git://anongit.freedesktop.org/git/xorg/driver/xf86-video-siliconmotion
http://cgit.freedesktop.org/xorg/driver/xf86-video-siliconmotion
+For patch submission instructions, see:
+
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
For more information on the git code manager, see:
http://wiki.x.org/wiki/GitPage
-----------------------------------------------------------------------------
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-siliconmotion-1.7.1/config.h.in new/xf86-video-siliconmotion-1.7.2/config.h.in
--- old/xf86-video-siliconmotion-1.7.1/config.h.in 2009-04-28 22:14:05.000000000 +0200
+++ new/xf86-video-siliconmotion-1.7.2/config.h.in 2009-07-02 17:43:24.000000000 +0200
@@ -35,6 +35,10 @@
/* X server has new mode code */
#undef HAVE_XMODES
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
/* Name of package */
#undef PACKAGE
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-siliconmotion-1.7.1/configure.ac new/xf86-video-siliconmotion-1.7.2/configure.ac
--- old/xf86-video-siliconmotion-1.7.1/configure.ac 2009-04-28 22:13:23.000000000 +0200
+++ new/xf86-video-siliconmotion-1.7.2/configure.ac 2009-07-02 17:42:58.000000000 +0200
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-siliconmotion],
- 1.7.1,
+ 1.7.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-siliconmotion)
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-siliconmotion-1.7.1/src/smi_driver.c new/xf86-video-siliconmotion-1.7.2/src/smi_driver.c
--- old/xf86-video-siliconmotion-1.7.1/src/smi_driver.c 2009-04-21 21:47:11.000000000 +0200
+++ new/xf86-video-siliconmotion-1.7.2/src/smi_driver.c 2009-05-28 20:21:05.000000000 +0200
@@ -190,104 +190,6 @@
{ -1, NULL, OPTV_NONE, {0}, FALSE }
};
-/*
- * Lists of symbols that may/may not be required by this driver.
- * This allows the loader to know which ones to issue warnings for.
- *
- * Note that vgahwSymbols and xaaSymbols are referenced outside the
- * XFree86LOADER define in later code, so are defined outside of that
- * define here also.
- */
-
-static const char *vgahwSymbols[] =
-{
- "vgaHWCopyReg",
- "vgaHWGetHWRec",
- "vgaHWGetIOBase",
- "vgaHWGetIndex",
- "vgaHWInit",
- "vgaHWLock",
- "vgaHWMapMem",
- "vgaHWProtect",
- "vgaHWRestore",
- "vgaHWSave",
- "vgaHWSaveScreen",
- "vgaHWSetMmioFuncs",
- "vgaHWSetStdFuncs",
- "vgaHWUnmapMem",
- "vgaHWddc1SetSpeedWeak",
- NULL
-};
-
-static const char *xaaSymbols[] =
-{
- "XAAGetCopyROP",
- "XAACreateInfoRec",
- "XAADestroyInfoRec",
- "XAAGetFallbackOps",
- "XAAInit",
- "XAAGetPatternROP",
- NULL
-};
-
-static const char *exaSymbols[] =
-{
- "exaDriverAlloc",
- "exaDriverInit",
- "exaDriverFini",
- "exaOffscreenAlloc",
- "exaOffscreenFree",
- "exaGetPixmapPitch",
- "exaGetPixmapOffset",
- "exaGetPixmapSize",
- NULL
-};
-
-static const char *ddcSymbols[] =
-{
- "xf86PrintEDID",
- "xf86DoEDID_DDC1",
- "xf86DoEDID_DDC2",
- "xf86SetDDCproperties",
- NULL
-};
-
-static const char *i2cSymbols[] =
-{
- "xf86CreateI2CBusRec",
- "xf86CreateI2CDevRec",
- "xf86DestroyI2CBusRec",
- "xf86DestroyI2CDevRec",
- "xf86I2CBusInit",
- "xf86I2CDevInit",
- "xf86I2CReadBytes",
- "xf86I2CWriteByte",
- NULL
-};
-
-static const char *int10Symbols[] =
-{
- "xf86ExecX86int10",
- "xf86FreeInt10",
- "xf86InitInt10",
- NULL
-};
-
-static const char *vbeSymbols[] =
-{
- "VBEInit",
- "vbeDoEDID",
- "vbeFree",
- NULL
-};
-
-static const char *fbSymbols[] =
-{
- "fbPictureInit",
- "fbScreenInit",
- NULL
-};
-
#ifdef XFree86LOADER
static MODULESETUPPROTO(siliconmotionSetup);
@@ -330,19 +232,6 @@
xf86AddDriver(&SILICONMOTION, module, 0);
/*
- * Modules that this driver always requires can be loaded here
- * by calling LoadSubModule().
- */
-
- /*
- * Tell the loader about symbols from other modules that this module
- * might refer to.
- */
- LoaderRefSymLists(vgahwSymbols, fbSymbols, xaaSymbols, exaSymbols,
- ddcSymbols, i2cSymbols, int10Symbols, vbeSymbols,
- NULL);
-
- /*
* The return value must be non-NULL on success even though there
* is no TearDownProc.
*/
@@ -537,8 +426,6 @@
if (!xf86LoadSubModule(pScrn, "vgahw"))
LEAVE(FALSE);
- xf86LoaderReqSymLists(vgahwSymbols, NULL);
-
/*
* Allocate a vgaHWRec
*/
@@ -578,6 +465,8 @@
xf86PrintDepthBpp(pScrn);
+ pSmi->Bpp = pScrn->bitsPerPixel >> 3;
+
/*
* This must happen after pScrn->display has been set because
* xf86SetWeight references it.
@@ -719,12 +608,10 @@
if (pSmi->useBIOS) {
if (xf86LoadSubModule(pScrn,"int10")) {
- xf86LoaderReqSymLists(int10Symbols,NULL);
pSmi->pInt10 = xf86InitInt10(pEnt->index);
}
if (pSmi->pInt10 && xf86LoadSubModule(pScrn, "vbe")) {
- xf86LoaderReqSymLists(vbeSymbols, NULL);
pSmi->pVbe = VBEInit(pSmi->pInt10, pEnt->index);
}
@@ -888,12 +775,9 @@
if(!IS_MSOC(pSmi)){
if (xf86LoadSubModule(pScrn, "i2c")) {
- xf86LoaderReqSymLists(i2cSymbols, NULL);
SMI_I2CInit(pScrn);
}
- if (xf86LoadSubModule(pScrn, "ddc")) {
- xf86LoaderReqSymLists(ddcSymbols, NULL);
- }
+ xf86LoadSubModule(pScrn, "ddc");
}
/*
@@ -937,9 +821,27 @@
/* Only allow growing the screen dimensions if EXA is being used */
if (!xf86InitialConfiguration (pScrn, !pSmi->NoAccel && pSmi->useEXA)){
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "No valid modes found\n");
+
+ SMI_EnableVideo(pScrn);
+ SMI_UnmapMem(pScrn);
LEAVE(FALSE);
}
+ /* Ensure that the framebuffer size just set fits in video memory. */
+ {
+ int aligned_pitch = (pScrn->virtualX*pSmi->Bpp + 15) & ~15;
+
+ if(aligned_pitch * pScrn->virtualY > pSmi->FBReserved){
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Not enough video memory "
+ "for the configured screen size (%dx%d) and color depth.\n",
+ pScrn->virtualX, pScrn->virtualY);
+
+ SMI_EnableVideo(pScrn);
+ SMI_UnmapMem(pScrn);
+ LEAVE(FALSE);
+ }
+ }
+
SMI_EnableVideo(pScrn);
SMI_UnmapMem(pScrn);
@@ -961,8 +863,6 @@
LEAVE(FALSE);
}
- xf86LoaderReqSymLists(fbSymbols, NULL);
-
/* Load XAA or EXA if needed */
if (!pSmi->NoAccel) {
if (!pSmi->useEXA) {
@@ -970,7 +870,6 @@
SMI_FreeRec(pScrn);
LEAVE(FALSE);
}
- xf86LoaderReqSymLists(xaaSymbols, NULL);
} else {
XF86ModReqInfo req;
int errmaj, errmin;
@@ -985,7 +884,6 @@
SMI_FreeRec(pScrn);
LEAVE(FALSE);
}
- xf86LoaderReqSymLists(exaSymbols, NULL);
}
}
@@ -1230,10 +1128,21 @@
/* The SM712 can be safely clocked up to 157MHz, according to
Silicon Motion engineers. */
pSmi->MCLK = 157000;
- }else
- pSmi->MCLK = 0;
- pSmi->MXCLK = 0;
+ } else if (IS_MSOC(pSmi)) {
+ /* Set some sane defaults for the clock settings if we are on a
+ SM502 and it's likely to be uninitialized. */
+
+ if (!xf86IsPrimaryPci(pSmi->PciInfo) &&
+ (READ_SCR(pSmi, DEVICE_ID) & 0xFF) >= 0xC0) {
+ pSmi->MCLK = 112000;
+ pSmi->MXCLK = 144000;
+ }
+
+ } else {
+ pSmi->MCLK = 0;
+ pSmi->MXCLK = 0;
+ }
/* MCLK from user settings */
if (xf86GetOptValFreq(pSmi->Options, OPTION_MCLK, OPTUNITS_MHZ, &real)) {
@@ -1423,6 +1332,55 @@
return (TRUE);
}
+/* HACK - In some cases the BIOS hasn't filled in the "scratchpad
+ registers" (SR71) with the right amount of memory installed (e.g. MIPS
+ platform). Probe it manually. */
+static unsigned long
+SMI_ProbeMem(ScrnInfoPtr pScrn, unsigned long mem_skip, unsigned long mem_max)
+{
+ SMIPtr pSmi = SMIPTR(pScrn);
+ unsigned long mem_probe = 1024*1024;
+ unsigned long aperture_base;
+ void* mem;
+
+ ENTER();
+
+ aperture_base = PCI_REGION_BASE(pSmi->PciInfo, 0, REGION_MEM) + mem_skip;
+ mem_max = min(mem_max , PCI_REGION_SIZE(pSmi->PciInfo, 0) - mem_skip);
+
+#ifndef XSERVER_LIBPCIACCESS
+ mem = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO, pSmi->PciTag,
+ aperture_base, mem_max);
+
+ if(!mem)
+ LEAVE(0);
+#else
+ if(pci_device_map_range(pSmi->PciInfo, aperture_base, mem_max,
+ PCI_DEV_MAP_FLAG_WRITABLE, &mem))
+ LEAVE(0);
+#endif
+
+ while(mem_probe <= mem_max){
+ MMIO_OUT32(mem, mem_probe-4, 0x55555555);
+ if(MMIO_IN32(mem, mem_probe-4) != 0x55555555)
+ break;
+
+ MMIO_OUT32(mem, mem_probe-4, 0xAAAAAAAA);
+ if(MMIO_IN32(mem, mem_probe-4) != 0xAAAAAAAA)
+ break;
+
+ mem_probe <<= 1;
+ }
+
+#ifndef XSERVER_LIBPCIACCESS
+ xf86UnMapVidMem(pScrn->scrnIndex, mem, mem_max);
+#else
+ pci_device_unmap_range(pSmi->PciInfo, mem, mem_max);
+#endif
+
+ LEAVE(mem_probe >> 1);
+}
+
static Bool
SMI_DetectMem(ScrnInfoPtr pScrn)
{
@@ -1452,6 +1410,9 @@
pSmi->videoRAMKBytes = lynx3d_table[config >> 6] * 1024 +
512;
break;
+ case SMI_LYNXEMplus:
+ pSmi->videoRAMKBytes = SMI_ProbeMem(pScrn, 0, 0x400000) / 1024;
+ break;
case SMI_LYNX3DM:
pSmi->videoRAMKBytes = lynx3dm_table[config >> 6] * 1024;
break;
@@ -1672,7 +1633,6 @@
pScrn->vtSema = TRUE;
pScrn->pScreen = pScreen;
- pSmi->Bpp = pScrn->bitsPerPixel >> 3;
pScrn->displayWidth = ((pScrn->virtualX * pSmi->Bpp + 15) & ~15) / pSmi->Bpp;
pSmi->fbArea = NULL;
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-siliconmotion-1.7.1/src/smi_exa.c new/xf86-video-siliconmotion-1.7.2/src/smi_exa.c
--- old/xf86-video-siliconmotion-1.7.1/src/smi_exa.c 2009-03-20 00:26:11.000000000 +0100
+++ new/xf86-video-siliconmotion-1.7.2/src/smi_exa.c 2009-07-02 17:42:34.000000000 +0200
@@ -78,9 +78,6 @@
SMI_Composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
int dstX, int dstY, int width, int height);
static void
-SMI501_Composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
- int dstX, int dstY, int width, int height);
-static void
SMI730_Composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
int dstX, int dstY, int width, int height);
static void
@@ -169,12 +166,11 @@
pSmi->EXADriverPtr->CheckComposite = SMI_CheckComposite;
pSmi->EXADriverPtr->PrepareComposite = SMI_PrepareComposite;
- if (IS_MSOC(pSmi))
- pSmi->EXADriverPtr->Composite = SMI501_Composite;
- else if (pSmi->Chipset == SMI_COUGAR3DR)
+ if (IS_MSOC(pSmi) || pSmi->Chipset == SMI_COUGAR3DR)
pSmi->EXADriverPtr->Composite = SMI730_Composite;
else
pSmi->EXADriverPtr->Composite = SMI_Composite;
+
pSmi->EXADriverPtr->DoneComposite = SMI_DoneComposite;
if(!exaDriverInit(pScreen, pSmi->EXADriverPtr)) {
@@ -711,38 +707,22 @@
LEAVE();
}
-#define MSOC_ROTBLTWIDTH 8
-static void
-SMI501_Composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
- int dstX, int dstY, int width, int height)
-{
- ENTER();
-
- /* SMI501 cannot rotate-blt more than 32 bytes.
- * Based on smi's sample smi_shadow.c */
- while (height > MSOC_ROTBLTWIDTH) {
- SMI_Composite(pDst, srcX, srcY, maskX, maskY, dstX, dstY,
- width, MSOC_ROTBLTWIDTH);
- srcY += MSOC_ROTBLTWIDTH;
- dstY += MSOC_ROTBLTWIDTH;
- height -= MSOC_ROTBLTWIDTH;
- }
- SMI_Composite(pDst, srcX, srcY, maskX, maskY, dstX, dstY, width, height);
-
- LEAVE();
-}
-
static void
SMI730_Composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
int dstX, int dstY, int width, int height)
{
+ ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
+ SMIPtr pSmi = SMIPTR(pScrn);
int maxPixels;
ENTER();
- /* SM731 cannot rotate-blt more than a certain number of pixels
- (based on a calculation from the Windows driver source */
- maxPixels = 1280 / pDst->drawable.bitsPerPixel;
+ /* Both SM501 and SM731 cannot rotate-blt more than a certain
+ number of pixels. */
+ if(IS_MSOC(pSmi))
+ maxPixels = 128 / pDst->drawable.bitsPerPixel;
+ else
+ maxPixels = 1280 / pDst->drawable.bitsPerPixel;
while(height>0){
SMI_Composite(pDst, srcX, srcY, maskX, maskY, dstX, dstY, width, min(height, maxPixels));
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-siliconmotion-1.7.1/src/smilynx_crtc.c new/xf86-video-siliconmotion-1.7.2/src/smilynx_crtc.c
--- old/xf86-video-siliconmotion-1.7.1/src/smilynx_crtc.c 2009-03-20 00:26:11.000000000 +0100
+++ new/xf86-video-siliconmotion-1.7.2/src/smilynx_crtc.c 2009-05-27 23:31:56.000000000 +0200
@@ -241,7 +241,7 @@
/* Adjust the pixel clock in case it is near one of the known
stable frequencies (KHz) */
int stable_clocks[] = {46534,};
- int epsilon = 2000;
+ int epsilon = 3000;
int i;
for (i=0; i < sizeof(stable_clocks)/sizeof(int); i++) {
++++++ xf86-video-sisusb-0.9.1.tar.bz2 -> xf86-video-sisusb-0.9.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-sisusb-0.9.1/aclocal.m4 new/xf86-video-sisusb-0.9.2/aclocal.m4
--- old/xf86-video-sisusb-0.9.1/aclocal.m4 2009-02-24 16:22:13.000000000 +0100
+++ new/xf86-video-sisusb-0.9.2/aclocal.m4 2009-07-02 17:45:49.000000000 +0200
@@ -2485,10 +2485,13 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # Add ABI-specific directories to the system library path.
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-sisusb-0.9.1/configure new/xf86-video-sisusb-0.9.2/configure
--- old/xf86-video-sisusb-0.9.1/configure 2009-02-24 16:22:17.000000000 +0100
+++ new/xf86-video-sisusb-0.9.2/configure 2009-07-02 17:45:54.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for xf86-video-sisusb 0.9.1.
+# Generated by GNU Autoconf 2.63 for xf86-video-sisusb 0.9.2.
#
# Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg.
#
@@ -745,8 +745,8 @@
# Identity of this package.
PACKAGE_NAME='xf86-video-sisusb'
PACKAGE_TARNAME='xf86-video-sisusb'
-PACKAGE_VERSION='0.9.1'
-PACKAGE_STRING='xf86-video-sisusb 0.9.1'
+PACKAGE_VERSION='0.9.2'
+PACKAGE_STRING='xf86-video-sisusb 0.9.2'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -1492,7 +1492,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-sisusb 0.9.1 to adapt to many kinds of systems.
+\`configure' configures xf86-video-sisusb 0.9.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1563,7 +1563,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-video-sisusb 0.9.1:";;
+ short | recursive ) echo "Configuration of xf86-video-sisusb 0.9.2:";;
esac
cat <<\_ACEOF
@@ -1672,7 +1672,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-video-sisusb configure 0.9.1
+xf86-video-sisusb configure 0.9.2
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1686,7 +1686,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-sisusb $as_me 0.9.1, which was
+It was created by xf86-video-sisusb $as_me 0.9.2, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2407,7 +2407,7 @@
# Define the identity of the package.
PACKAGE='xf86-video-sisusb'
- VERSION='0.9.1'
+ VERSION='0.9.2'
cat >>confdefs.h <<_ACEOF
@@ -9796,10 +9796,13 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # Add ABI-specific directories to the system library path.
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -10744,7 +10747,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10747 "configure"
+#line 10750 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10840,7 +10843,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10843 "configure"
+#line 10846 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13245,7 +13248,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xf86-video-sisusb $as_me 0.9.1, which was
+This file was extended by xf86-video-sisusb $as_me 0.9.2, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13308,7 +13311,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-xf86-video-sisusb config.status 0.9.1
+xf86-video-sisusb config.status 0.9.2
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-sisusb-0.9.1/configure.ac new/xf86-video-sisusb-0.9.2/configure.ac
--- old/xf86-video-sisusb-0.9.1/configure.ac 2009-02-24 16:22:05.000000000 +0100
+++ new/xf86-video-sisusb-0.9.2/configure.ac 2009-07-02 17:45:37.000000000 +0200
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-sisusb],
- 0.9.1,
+ 0.9.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-sisusb)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-sisusb-0.9.1/src/sisusb_driver.c new/xf86-video-sisusb-0.9.2/src/sisusb_driver.c
--- old/xf86-video-sisusb-0.9.1/src/sisusb_driver.c 2008-08-19 19:32:32.000000000 +0200
+++ new/xf86-video-sisusb-0.9.2/src/sisusb_driver.c 2009-05-28 20:21:05.000000000 +0200
@@ -90,24 +90,6 @@
{ -1, NULL }
};
-static const char *fbSymbols[] = {
- "fbPictureInit",
- "fbScreenInit",
- NULL
-};
-
-static const char *shadowSymbols[] = {
- "ShadowFBInit",
- NULL
-};
-
-static const char *ramdacSymbols[] = {
- "xf86CreateCursorInfoRec",
- "xf86DestroyCursorInfoRec",
- "xf86InitCursor",
- NULL
-};
-
#ifdef XFree86LOADER
static MODULESETUPPROTO(sisusbSetup);
@@ -143,7 +125,6 @@
if(!setupDone) {
setupDone = TRUE;
xf86AddDriver(&SISUSB, module, SISUSB_HaveDriverFuncs);
- LoaderRefSymLists(fbSymbols, shadowSymbols, ramdacSymbols, NULL);
return (pointer)TRUE;
}
@@ -874,8 +855,6 @@
return FALSE;
}
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
-
/* Set pScrn->monitor */
pScrn->monitor = pScrn->confScreen->monitor;
@@ -1444,7 +1423,6 @@
SISUSBFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(fbSymbols, NULL);
/* Load shadowfb (if needed) */
if(pSiSUSB->ShadowFB) {
@@ -1454,7 +1432,6 @@
SISUSBFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(shadowSymbols, NULL);
}
pSiSUSB->UseVESA = 0;
++++++ xf86-video-tdfx-1.4.1.tar.bz2 -> xf86-video-tdfx-1.4.2.tar.bz2 ++++++
++++ 54872 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.4.1/README new/xf86-video-tdfx-1.4.2/README
--- old/xf86-video-tdfx-1.4.1/README 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86-video-tdfx-1.4.2/README 2009-05-27 23:32:10.000000000 +0200
@@ -0,0 +1,20 @@
+xf86-video-tdfx - 3Dfx video driver for the Xorg X server
+
+Please submit bugs & patches to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/driver/xf86-video-tdfx
+
+ http://cgit.freedesktop.org/xorg/driver/xf86-video-tdfx
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
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.4.1/config.h.in new/xf86-video-tdfx-1.4.2/config.h.in
--- old/xf86-video-tdfx-1.4.1/config.h.in 2008-12-22 06:20:58.000000000 +0100
+++ new/xf86-video-tdfx-1.4.2/config.h.in 2009-07-02 17:48:10.000000000 +0200
@@ -32,6 +32,10 @@
/* Define to 1 if you have the header file. */
#undef HAVE_UNISTD_H
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
/* Name of package */
#undef PACKAGE
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.4.1/configure.ac new/xf86-video-tdfx-1.4.2/configure.ac
--- old/xf86-video-tdfx-1.4.1/configure.ac 2008-12-22 06:20:18.000000000 +0100
+++ new/xf86-video-tdfx-1.4.2/configure.ac 2009-07-02 17:47:46.000000000 +0200
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-tdfx],
- 1.4.1,
+ 1.4.2,
[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.4.1/man/tdfx.man new/xf86-video-tdfx-1.4.2/man/tdfx.man
--- old/xf86-video-tdfx-1.4.1/man/tdfx.man 2008-03-03 01:04:17.000000000 +0100
+++ new/xf86-video-tdfx-1.4.2/man/tdfx.man 2009-05-27 23:32:10.000000000 +0200
@@ -60,6 +60,6 @@
.SH FILES
tdfx_drv.o
.SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
.SH AUTHORS
Authors include: ...
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.4.1/src/tdfx_driver.c new/xf86-video-tdfx-1.4.2/src/tdfx_driver.c
--- old/xf86-video-tdfx-1.4.1/src/tdfx_driver.c 2008-12-22 06:20:01.000000000 +0100
+++ new/xf86-video-tdfx-1.4.2/src/tdfx_driver.c 2009-05-28 20:21:05.000000000 +0200
@@ -239,95 +239,6 @@
{ -1, NULL, OPTV_NONE, {0}, FALSE}
};
-static const char *vgahwSymbols[] = {
- "vgaHWEnable",
- "vgaHWFreeHWRec",
- "vgaHWGetHWRec",
- "vgaHWGetIOBase",
- "vgaHWGetIndex",
- "vgaHWInit",
- "vgaHWLock",
- "vgaHWMapMem",
- "vgaHWProtect",
- "vgaHWRestore",
- "vgaHWSave",
- "vgaHWSeqReset",
- "vgaHWUnlock",
- 0
-};
-
-static const char *ramdacSymbols[] = {
- "xf86CreateCursorInfoRec",
- "xf86InitCursor",
- NULL
-};
-
-static const char *ddcSymbols[] = {
- "xf86PrintEDID",
- "xf86SetDDCproperties",
- "xf86DoEDID_DDC2",
- NULL
-};
-
-static const char *i2cSymbols[] = {
- "xf86CreateI2CBusRec",
- "xf86I2CBusInit",
- NULL
-};
-
-static const char *fbSymbols[] = {
- "fbPictureInit",
- "fbScreenInit",
- NULL
-};
-
-static const char *xaaSymbols[] = {
- "XAACreateInfoRec",
- "XAADestroyInfoRec",
- "XAAInit",
- "XAAReverseBitOrder",
- NULL
-};
-
-static const char *vbeSymbols[] = {
- "VBEInit",
- "vbeDoEDID",
- "vbeFree",
- NULL
-};
-
-static const char *int10Symbols[] = {
- "xf86FreeInt10",
- "xf86InitInt10",
- NULL
-};
-
-#ifdef XF86DRI
-static const char *drmSymbols[] = {
- "drmAddMap",
- "drmFreeVersion",
- "drmGetVersion",
- NULL
-};
-
-static const char *driSymbols[] = {
- "DRICloseScreen",
- "DRICreateInfoRec",
- "DRIDestroyInfoRec",
- "DRIFinishScreenInit",
- "DRIGetSAREAPrivate",
- "DRILock",
- "DRIMoveBuffersHelper",
- "DRIQueryVersion",
- "DRIScreenInit",
- "DRIUnlock",
- "GlxSetVisualConfigs",
- "DRICreatePCIBusID",
- NULL
-};
-
-#endif
-
#ifdef XFree86LOADER
static MODULESETUPPROTO(tdfxSetup);
@@ -360,22 +271,6 @@
xf86AddDriver(&TDFX, module, 1);
/*
- * Modules that this driver always requires may be loaded here
- * by calling LoadSubModule().
- */
-
- /*
- * Tell the loader about symbols from other modules that this module
- * might refer to.
- */
- LoaderRefSymLists(vgahwSymbols, fbSymbols, xaaSymbols,
- ramdacSymbols, vbeSymbols, int10Symbols,
-#ifdef XF86DRI
- drmSymbols, driSymbols,
-#endif
- NULL);
-
- /*
* The return value must be non-NULL on success even though there
* is no TearDownProc.
*/
@@ -925,8 +820,6 @@
/* The vgahw module should be loaded here when needed */
if (!xf86LoadSubModule(pScrn, "vgahw")) return FALSE;
- xf86LoaderReqSymLists(vgahwSymbols, NULL);
-
/* Allocate a vgaHWRec */
if (!vgaHWGetHWRec(pScrn)) return FALSE;
@@ -935,7 +828,6 @@
if (xf86LoadSubModule(pScrn, "int10")) {
xf86Int10InfoPtr pInt;
- xf86LoaderReqSymLists(int10Symbols, NULL);
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Softbooting the board (through the int10 interface).\n");
pInt = xf86InitInt10(pTDFX->pEnt->index);
@@ -1206,14 +1098,12 @@
TDFXFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(fbSymbols, NULL);
if (!xf86ReturnOptValBool(pTDFX->Options, OPTION_NOACCEL, FALSE)) {
if (!xf86LoadSubModule(pScrn, "xaa")) {
TDFXFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(xaaSymbols, NULL);
}
if (!xf86GetOptValBool(pTDFX->Options, OPTION_SHOWCACHE, &(pTDFX->ShowCache))) {
@@ -1239,7 +1129,6 @@
TDFXFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
/* Load DDC and I2C for monitor ID */
@@ -1247,13 +1136,11 @@
TDFXFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(i2cSymbols, NULL);
if (!xf86LoadSubModule(pScrn, "ddc")) {
TDFXFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(ddcSymbols, NULL);
/* try to read read DDC2 data */
if (TDFXI2cInit(pScrn)) {
@@ -1268,7 +1155,6 @@
if (xf86LoadSubModule(pScrn, "vbe")) {
vbeInfoPtr pVbe = VBEInit(NULL,pTDFX->pEnt->index);
- xf86LoaderReqSymLists(vbeSymbols, NULL);
pMon = vbeDoEDID(pVbe, NULL);
vbeFree(pVbe);
xf86SetDDCproperties(pScrn,xf86PrintEDID(pMon));
@@ -1341,9 +1227,7 @@
#ifdef XF86DRI
/* Load the dri module if requested. */
if (xf86ReturnOptValBool(pTDFX->Options, OPTION_DRI, FALSE)) {
- if (xf86LoadSubModule(pScrn, "dri")) {
- xf86LoaderReqSymLists(driSymbols, drmSymbols, NULL);
- }
+ xf86LoadSubModule(pScrn, "dri");
}
#endif
return TRUE;
++++++ xf86-video-trident-1.3.1.tar.bz2 -> xf86-video-trident-1.3.2.tar.bz2 ++++++
++++ 54384 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-trident-1.3.1/README new/xf86-video-trident-1.3.2/README
--- old/xf86-video-trident-1.3.1/README 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86-video-trident-1.3.2/README 2009-05-27 23:32:14.000000000 +0200
@@ -0,0 +1,20 @@
+xf86-video-trident - Trident video driver for the Xorg X server
+
+Please submit bugs & patches to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/driver/xf86-video-trident
+
+ http://cgit.freedesktop.org/xorg/driver/xf86-video-trident
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
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-trident-1.3.1/config.h.in new/xf86-video-trident-1.3.2/config.h.in
--- old/xf86-video-trident-1.3.1/config.h.in 2008-12-22 05:00:39.000000000 +0100
+++ new/xf86-video-trident-1.3.2/config.h.in 2009-07-02 17:50:34.000000000 +0200
@@ -35,6 +35,10 @@
/* Define to 1 if you have the header file. */
#undef HAVE_UNISTD_H
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
/* Name of package */
#undef PACKAGE
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-trident-1.3.1/configure.ac new/xf86-video-trident-1.3.2/configure.ac
--- old/xf86-video-trident-1.3.1/configure.ac 2008-12-22 05:00:22.000000000 +0100
+++ new/xf86-video-trident-1.3.2/configure.ac 2009-07-02 17:50:10.000000000 +0200
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-trident],
- 1.3.1,
+ 1.3.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-trident)
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-trident-1.3.1/man/trident.man new/xf86-video-trident-1.3.2/man/trident.man
--- old/xf86-video-trident-1.3.1/man/trident.man 2008-12-22 04:59:18.000000000 +0100
+++ new/xf86-video-trident-1.3.2/man/trident.man 2009-05-27 23:32:14.000000000 +0200
@@ -133,6 +133,6 @@
simpler acceleration architecture designed to better accelerate the X Render
extension. Default: "XAA".
.SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
.SH AUTHOR
Author: Alan Hourihane, EXA for Blade chips by Jesse Barnes
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-trident-1.3.1/src/trident_driver.c new/xf86-video-trident-1.3.2/src/trident_driver.c
--- old/xf86-video-trident-1.3.1/src/trident_driver.c 2008-12-22 04:59:18.000000000 +0100
+++ new/xf86-video-trident-1.3.2/src/trident_driver.c 2009-05-28 20:21:06.000000000 +0200
@@ -488,86 +488,6 @@
#endif
#endif
-static const char *xaaSymbols[] = {
- "XAAGetCopyROP",
- "XAACreateInfoRec",
- "XAADestroyInfoRec",
- "XAAInit",
- "XAAGetPatternROP",
- NULL
-};
-
-const char *exaSymbols[] = {
- "exaDriverAlloc",
- "exaDriverInit",
- "exaDriverFini",
- "exaOffscreenAlloc",
- "exaOffscreenFree",
- NULL
-};
-
-static const char *vgahwSymbols[] = {
- "vgaHWBlankScreenWeak",
- "vgaHWFreeHWRec",
- "vgaHWGetHWRec",
- "vgaHWGetIOBase",
- "vgaHWGetIndex",
- "vgaHWInit",
- "vgaHWLock",
- "vgaHWMapMem",
- "vgaHWProtectWeak",
- "vgaHWRestore",
- "vgaHWSave",
- "vgaHWSaveScreen",
- "vgaHWSetMmioFuncs",
- "vgaHWUnlock",
- NULL
-};
-
-static const char *fbSymbols[] = {
- "fbPictureInit",
- "fbScreenInit",
- NULL
-};
-
-static const char *ramdacSymbols[] = {
- "xf86CreateCursorInfoRec",
- "xf86DestroyCursorInfoRec",
- "xf86InitCursor",
- NULL
-};
-
-static const char *ddcSymbols[] = {
- "xf86PrintEDID",
- "xf86SetDDCproperties",
- NULL
-};
-
-static const char *i2cSymbols[] = {
- "xf86CreateI2CBusRec",
- "xf86I2CBusInit",
- NULL
-};
-
-static const char *int10Symbols[] = {
- "xf86ExecX86int10",
- "xf86FreeInt10",
- "xf86InitInt10",
- NULL
-};
-
-static const char *shadowSymbols[] = {
- "shadowInit",
- NULL
-};
-
-static const char *vbeSymbols[] = {
- "VBEInit",
- "vbeDoEDID",
- "vbeFree",
- NULL
-};
-
#ifdef XFree86LOADER
static MODULESETUPPROTO(tridentSetup);
@@ -600,9 +520,6 @@
if (!setupDone) {
setupDone = TRUE;
xf86AddDriver(&TRIDENT, module, 0);
- LoaderRefSymLists(vgahwSymbols, fbSymbols, i2cSymbols, vbeSymbols,
- ramdacSymbols, int10Symbols,
- xaaSymbols, exaSymbols, shadowSymbols, NULL);
return (pointer)TRUE;
}
@@ -1172,8 +1089,6 @@
if (!xf86LoadSubModule(pScrn, "vgahw"))
return FALSE;
- xf86LoaderReqSymLists(vgahwSymbols, NULL);
-
/*
* Allocate a vgaHWRec
*/
@@ -1191,8 +1106,6 @@
if (!xf86LoadSubModule(pScrn, "ramdac"))
return FALSE;
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
-
/*
* This must happen after pScrn->display has been set because
* xf86SetWeight references it.
@@ -1545,7 +1458,6 @@
if (xf86LoadSubModule(pScrn, "vbe")) {
vbeInfoPtr pVbe;
- xf86LoaderReqSymLists(vbeSymbols, NULL);
pVbe = VBEInit(NULL,pTrident->pEnt->index);
pMon = vbeDoEDID(pVbe, NULL);
#ifdef VBE_INFO
@@ -1563,7 +1475,6 @@
TRIDENTFreeRec(pScrn);
return FALSE;
} else {
- xf86LoaderReqSymLists(ddcSymbols, NULL);
xf86SetDDCproperties(pScrn,xf86PrintEDID(pMon));
ddcLoaded = TRUE;
}
@@ -2431,8 +2342,6 @@
return FALSE;
}
- xf86LoaderReqSymLists(fbSymbols, NULL);
-
if (!xf86LoadSubModule(pScrn, "i2c")) {
if (IsPciCard && UseMMIO) {
TRIDENTDisableMMIO(pScrn);
@@ -2442,15 +2351,12 @@
return FALSE;
}
- xf86LoaderReqSymLists(i2cSymbols, NULL);
-
/* Load shadow if needed */
if (pTrident->ShadowFB) {
if (!xf86LoadSubModule(pScrn, "shadow")) {
TRIDENTFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(shadowSymbols, NULL);
}
/* Load XAA if needed */
@@ -2464,7 +2370,6 @@
TRIDENTFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(xaaSymbols, NULL);
}
if (pTrident->useEXA) {
@@ -2485,7 +2390,6 @@
TRIDENTFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(exaSymbols, NULL);
}
switch (pScrn->displayWidth * pScrn->bitsPerPixel / 8) {
@@ -2517,8 +2421,6 @@
TRIDENTFreeRec(pScrn);
return FALSE;
}
-
- xf86LoaderReqSymLists(ddcSymbols, NULL);
if (IsPciCard && UseMMIO) {
TRIDENTDisableMMIO(pScrn);
@@ -2874,7 +2776,6 @@
#endif
{
if (xf86LoadSubModule(pScrn, "int10")) {
- xf86LoaderReqSymLists(int10Symbols, NULL);
xf86DrvMsg(pScrn->scrnIndex,X_INFO,"Initializing int10\n");
pTrident->Int10 = xf86InitInt10(pTrident->pEnt->index);
}
++++++ xf86-video-tseng-1.2.1.tar.bz2 -> xf86-video-tseng-1.2.2.tar.bz2 ++++++
++++ 54943 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-tseng-1.2.1/README new/xf86-video-tseng-1.2.2/README
--- old/xf86-video-tseng-1.2.1/README 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86-video-tseng-1.2.2/README 2009-05-27 23:32:16.000000000 +0200
@@ -0,0 +1,20 @@
+xf86-video-tseng - Tseng Labs video driver for the Xorg X server
+
+Please submit bugs & patches to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/driver/xf86-video-tseng
+
+ http://cgit.freedesktop.org/xorg/driver/xf86-video-tseng
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
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-tseng-1.2.1/config.h.in new/xf86-video-tseng-1.2.2/config.h.in
--- old/xf86-video-tseng-1.2.1/config.h.in 2008-12-22 06:02:57.000000000 +0100
+++ new/xf86-video-tseng-1.2.2/config.h.in 2009-07-02 17:52:42.000000000 +0200
@@ -38,6 +38,10 @@
/* Have 4bpp support */
#undef HAVE_XF4BPP
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
/* Name of package */
#undef PACKAGE
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-tseng-1.2.1/configure.ac new/xf86-video-tseng-1.2.2/configure.ac
--- old/xf86-video-tseng-1.2.1/configure.ac 2008-12-22 06:02:30.000000000 +0100
+++ new/xf86-video-tseng-1.2.2/configure.ac 2009-07-02 17:52:21.000000000 +0200
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-tseng],
- 1.2.1,
+ 1.2.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-tseng)
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-tseng-1.2.1/man/tseng.man new/xf86-video-tseng-1.2.2/man/tseng.man
--- old/xf86-video-tseng-1.2.1/man/tseng.man 2008-03-03 01:03:12.000000000 +0100
+++ new/xf86-video-tseng-1.2.2/man/tseng.man 2009-05-27 23:32:16.000000000 +0200
@@ -25,6 +25,6 @@
details. This section only covers configuration details specific to this
driver.
.SH "SEE ALSO"
-__xservername__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(1), __xconfigfile__(__filemansuffix__), Xserver(1), X(__miscmansuffix__)
.SH AUTHORS
Authors include: ...
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-tseng-1.2.1/src/tseng_driver.c new/xf86-video-tseng-1.2.2/src/tseng_driver.c
--- old/xf86-video-tseng-1.2.1/src/tseng_driver.c 2008-12-22 06:02:16.000000000 +0100
+++ new/xf86-video-tseng-1.2.2/src/tseng_driver.c 2009-05-28 20:21:06.000000000 +0200
@@ -180,58 +180,6 @@
{0}, FALSE}
};
-static const char *int10Symbols[] = {
- "xf86FreeInt10",
- "xf86InitInt10",
- NULL
-};
-
-static const char *vgaHWSymbols[] = {
- "vgaHWFreeHWRec",
- "vgaHWGetHWRec",
- "vgaHWGetIOBase",
- "vgaHWGetIndex",
- "vgaHWHandleColormaps",
- "vgaHWInit",
- "vgaHWLock",
- "vgaHWMapMem",
- "vgaHWProtect",
- "vgaHWRestore",
- "vgaHWSave",
- "vgaHWSaveScreen",
- "vgaHWUnlock",
- "vgaHWUnmapMem",
- NULL
-};
-
-#ifdef XFree86LOADER
-static const char* miscfbSymbols[] = {
- "xf1bppScreenInit",
- "xf4bppScreenInit",
- NULL
-};
-#endif
-
-static const char* fbSymbols[] = {
- "fbPictureInit",
- "fbScreenInit",
- NULL
-};
-
-static const char *ramdacSymbols[] = {
- "xf86CreateCursorInfoRec",
- "xf86DestroyCursorInfoRec",
- "xf86InitCursor",
- NULL
-};
-
-static const char *xaaSymbols[] = {
- "XAACreateInfoRec",
- "XAADestroyInfoRec",
- "XAAInit",
- NULL
-};
-
#ifdef XFree86LOADER
static MODULESETUPPROTO(tsengSetup);
@@ -267,17 +215,6 @@
xf86AddDriver(&TSENG, module, 0);
/*
- * Modules that this driver always requires can be loaded here
- * by calling LoadSubModule().
- */
- /*
- * Tell the loader about symbols from other modules that this module
- * might refer to.
- */
- LoaderRefSymLists(vgaHWSymbols, miscfbSymbols, fbSymbols, xaaSymbols,
- int10Symbols, ramdacSymbols, NULL);
-
- /*
* The return value must be non-NULL on success even though there
* is no TearDownProc.
*/
@@ -1020,7 +957,6 @@
#if 1
if (xf86LoadSubModule(pScrn, "int10")) {
xf86Int10InfoPtr pInt;
- xf86LoaderReqSymLists(int10Symbols, NULL);
#if 1
xf86DrvMsg(pScrn->scrnIndex,X_INFO,"initializing int10\n");
pInt = xf86InitInt10(pTseng->pEnt->index);
@@ -1031,7 +967,6 @@
if (!xf86LoadSubModule(pScrn, "vgahw"))
return FALSE;
- xf86LoaderReqSymLists(vgaHWSymbols, NULL);
/*
* Allocate a vgaHWRec
*/
@@ -1240,21 +1175,18 @@
TsengFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymbols("xf1bppScreenInit", NULL);
break;
case 4:
if (xf86LoadSubModule(pScrn, "xf4bpp") == NULL) {
TsengFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymbols("xf4bppScreenInit", NULL);
break;
default:
if (xf86LoadSubModule(pScrn, "fb") == NULL) {
TsengFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(fbSymbols, NULL);
break;
}
@@ -1264,7 +1196,6 @@
TsengFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(xaaSymbols, NULL);
}
/* Load ramdac if needed */
if (pTseng->HWCursor) {
@@ -1272,7 +1203,6 @@
TsengFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
/* TsengLock(pScrn); */
++++++ xf86-video-voodoo-1.2.1.tar.bz2 -> xf86-video-voodoo-1.2.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-voodoo-1.2.1/aclocal.m4 new/xf86-video-voodoo-1.2.2/aclocal.m4
--- old/xf86-video-voodoo-1.2.1/aclocal.m4 2009-02-24 16:28:36.000000000 +0100
+++ new/xf86-video-voodoo-1.2.2/aclocal.m4 2009-07-02 17:54:34.000000000 +0200
@@ -2485,10 +2485,13 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # Add ABI-specific directories to the system library path.
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-voodoo-1.2.1/configure new/xf86-video-voodoo-1.2.2/configure
--- old/xf86-video-voodoo-1.2.1/configure 2009-02-24 16:28:40.000000000 +0100
+++ new/xf86-video-voodoo-1.2.2/configure 2009-07-02 17:54:39.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for xf86-video-voodoo 1.2.1.
+# Generated by GNU Autoconf 2.63 for xf86-video-voodoo 1.2.2.
#
# Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg.
#
@@ -745,8 +745,8 @@
# Identity of this package.
PACKAGE_NAME='xf86-video-voodoo'
PACKAGE_TARNAME='xf86-video-voodoo'
-PACKAGE_VERSION='1.2.1'
-PACKAGE_STRING='xf86-video-voodoo 1.2.1'
+PACKAGE_VERSION='1.2.2'
+PACKAGE_STRING='xf86-video-voodoo 1.2.2'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -1496,7 +1496,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-voodoo 1.2.1 to adapt to many kinds of systems.
+\`configure' configures xf86-video-voodoo 1.2.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1567,7 +1567,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-video-voodoo 1.2.1:";;
+ short | recursive ) echo "Configuration of xf86-video-voodoo 1.2.2:";;
esac
cat <<\_ACEOF
@@ -1680,7 +1680,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-video-voodoo configure 1.2.1
+xf86-video-voodoo configure 1.2.2
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1694,7 +1694,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-voodoo $as_me 1.2.1, which was
+It was created by xf86-video-voodoo $as_me 1.2.2, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2415,7 +2415,7 @@
# Define the identity of the package.
PACKAGE='xf86-video-voodoo'
- VERSION='1.2.1'
+ VERSION='1.2.2'
cat >>confdefs.h <<_ACEOF
@@ -9804,10 +9804,13 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # Add ABI-specific directories to the system library path.
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -10752,7 +10755,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10755 "configure"
+#line 10758 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10848,7 +10851,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10851 "configure"
+#line 10854 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13508,7 +13511,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xf86-video-voodoo $as_me 1.2.1, which was
+This file was extended by xf86-video-voodoo $as_me 1.2.2, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13571,7 +13574,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-xf86-video-voodoo config.status 1.2.1
+xf86-video-voodoo config.status 1.2.2
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-voodoo-1.2.1/configure.ac new/xf86-video-voodoo-1.2.2/configure.ac
--- old/xf86-video-voodoo-1.2.1/configure.ac 2009-02-24 16:28:29.000000000 +0100
+++ new/xf86-video-voodoo-1.2.2/configure.ac 2009-07-02 17:54:26.000000000 +0200
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-voodoo],
- 1.2.1,
+ 1.2.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-voodoo)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-voodoo-1.2.1/man/voodoo.man new/xf86-video-voodoo-1.2.2/man/voodoo.man
--- old/xf86-video-voodoo-1.2.1/man/voodoo.man 2008-03-17 18:24:34.000000000 +0100
+++ new/xf86-video-voodoo-1.2.2/man/voodoo.man 2009-05-27 23:32:24.000000000 +0200
@@ -67,6 +67,6 @@
sstfb frame buffer driver as there is insufficient information to restore
the chip to its previous state.
.SH "SEE ALSO"
-__xservername__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(1), __xconfigfile__(__filemansuffix__), Xserver(1), X(__miscmansuffix__)
.SH AUTHORS
Authors: Alan Cox, Ghozlane Toumi, Henrik Harmsen.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-voodoo-1.2.1/src/voodoo_driver.c new/xf86-video-voodoo-1.2.2/src/voodoo_driver.c
--- old/xf86-video-voodoo-1.2.1/src/voodoo_driver.c 2009-02-24 16:27:23.000000000 +0100
+++ new/xf86-video-voodoo-1.2.2/src/voodoo_driver.c 2009-05-28 20:21:06.000000000 +0200
@@ -128,34 +128,6 @@
{-1, NULL }
};
-
-/*
- * List of symbols from other modules that this module references. This
- * list is used to tell the loader that it is OK for symbols here to be
- * unresolved providing that it hasn't been told that they haven't been
- * told that they are essential via a call to xf86LoaderReqSymbols() or
- * xf86LoaderReqSymLists(). The purpose is this is to avoid warnings about
- * unresolved symbols that are not required.
- */
-
-static const char *fbSymbols[] = {
- "fbScreenInit",
- "fbPictureInit",
- NULL
-};
-
-static const char *xaaSymbols[] = {
- "XAACreateInfoRec",
- "XAAInit",
- "XAADestroyInfoRec",
- NULL
-};
-
-static const char *shadowSymbols[] = {
- "ShadowFBInit",
- NULL
-};
-
#ifdef XFree86LOADER
static XF86ModuleVersionInfo voodooVersRec =
@@ -181,7 +153,6 @@
{
setupDone = TRUE;
xf86AddDriver(&VOODOO, module, 0);
- LoaderRefSymLists(fbSymbols, shadowSymbols, xaaSymbols,NULL);
return (pointer)1;
}
return NULL;
@@ -583,15 +554,11 @@
return FALSE;
}
- xf86LoaderReqSymLists(fbSymbols, NULL);
-
if (!xf86LoadSubModule(pScrn, "xaa")) {
VoodooFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(xaaSymbols, NULL);
-
if(pVoo->ShadowFB)
{
/* Load the shadow framebuffer */
@@ -599,7 +566,6 @@
VoodooFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(shadowSymbols, NULL);
}
return TRUE;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org