xserver-xorg-video-tdfx: Changes to 'debian-unstable'
.gitignore | 70 ++++++++++-
COPYING | 27 +++-
ChangeLog | 337 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
Makefile.am | 11 +
configure.ac | 55 ++++----
debian/changelog | 7 +
man/.gitignore | 2
man/Makefile.am | 59 +++------
man/tdfx.man | 1
src/.gitignore | 6
src/tdfx.h | 12 +
src/tdfx_accel.c | 8 -
src/tdfx_dga.c | 4
src/tdfx_dri.c | 39 +++---
src/tdfx_driver.c | 63 +++++-----
src/tdfx_priv.c | 8 -
src/tdfx_sli.c | 5
src/tdfx_video.c | 28 ++--
18 files changed, 572 insertions(+), 170 deletions(-)
New commits:
commit b0667759652c2c9af82c404741be600b44575687
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon May 7 02:57:27 2012 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 7ec2b31..ead8fb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-tdfx (1:1.4.4-1) UNRELEASED; urgency=low
+xserver-xorg-video-tdfx (1:1.4.4-1) unstable; urgency=low
* New upstream release:
- Fix FTBFS with X server 1.12.
- -- Cyril Brulebois <kibi@debian.org> Mon, 07 May 2012 02:53:55 +0200
+ -- Cyril Brulebois <kibi@debian.org> Mon, 07 May 2012 02:57:09 +0200
xserver-xorg-video-tdfx (1:1.4.3-4) unstable; urgency=low
commit 00258f9187fc4cba3f1b4a42297dffdbb8cd934f
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon May 7 02:55:07 2012 +0200
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 832e811..6105da4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,340 @@
+commit 98d24dd99052322c71d1676e6d66c2c724f6066a
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Mar 23 19:59:33 2012 -0700
+
+ xf86-video-tdfx 1.4.4
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit a985b54c8559d7ff8f5481004d54989ed7499237
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Jan 4 14:57:56 2012 +1000
+
+ Untangle XF86DRI from the driver-specific DRI define
+
+ XF86DRI is defined by xorg-server.h, so --disable-dri in the driver
+ itself does exactly nothing other than not fill in the CFLAGS and thus stop
+ the driver from compiling.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 4d56f3a6a69717b04f46f3e22c3a0834050c1a46
+Author: Stefan Dirsch <sndirsch@novell.com>
+Date: Thu Jul 30 11:28:28 2009 +0200
+
+ Fix RPMLINT warning "64bit-portability-issue".
+
+ Signed-off-by: Johannes Obermayr <johannesobermayr@gmx.de>
+ Reviewed-by: Tormod Volden <debian.tormod@gmail.com>
+
+commit fe60f0ed2a0647937cc46a45d497bdf7da4061a4
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Dec 19 17:33:17 2011 -0500
+
+ Stop uselessly including xf86Priv.h
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 5b5d3c8b23865724d4f6d71610760e80e4b032e6
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Dec 19 17:32:27 2011 -0500
+
+ Fix for new vgaHW ABI
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 92cb819839a2f37c3e3db4831aa45e5bb9b00651
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Dec 19 17:31:45 2011 -0500
+
+ Make failure to XAA non-fatal
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 4ea96c222ad0900ad53f506e485588e2a49a22f4
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu Nov 17 15:54:27 2011 -0500
+
+ Check ABI major not encoded ABI
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 32cd2dfa1214ed3260bf2e40bad06927b18f7f7b
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Nov 16 14:44:02 2011 -0500
+
+ Adapt to missing PIOOffset in vgahw
+
+ This is actually pretty lame, and I should probably extend vgahw to make
+ it easier to do this kind of trick.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit d7be4a953859f12083c1743c73712f9f510d7fda
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Wed Oct 19 00:41:56 2011 -0700
+
+ Use unsigned long rather than deprecated IOADDRESS
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 3a97ecb50f326dbe0e1a3b3656806a8a2d2a1c3d
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sun Oct 9 18:46:10 2011 -0700
+
+ Fix compiler warnings about signedness
+
+ tdfx_sli.c:23:7: warning: pointer targets in passing argument 2 of ‘pci_device_cfg_read_u32’ differ in signedness
+ /var/tmp/jhbuild/include/pciaccess.h:153:5: note: expected ‘uint32_t *’ but argument is of type ‘int *’
+ tdfx_sli.c:31:7: warning: pointer targets in passing argument 2 of ‘pci_device_cfg_read_u32’ differ in signedness
+ /var/tmp/jhbuild/include/pciaccess.h:153:5: note: expected ‘uint32_t *’ but argument is of type ‘int *’
+ tdfx_sli.c:40:7: warning: pointer targets in passing argument 2 of ‘pci_device_cfg_read_u32’ differ in signedness
+ /var/tmp/jhbuild/include/pciaccess.h:153:5: note: expected ‘uint32_t *’ but argument is of type ‘int *’
+ tdfx_sli.c:45:7: warning: pointer targets in passing argument 2 of ‘pci_device_cfg_read_u32’ differ in signedness
+ /var/tmp/jhbuild/include/pciaccess.h:153:5: note: expected ‘uint32_t *’ but argument is of type ‘int *’
+ tdfx_sli.c: In function ‘TDFXSetupSLI’:
+ tdfx_sli.c:155:2: warning: pointer targets in passing argument 2 of ‘pci_device_cfg_read_u32’ differ in signedness
+ /var/tmp/jhbuild/include/pciaccess.h:153:5: note: expected ‘uint32_t *’ but argument is of type ‘int *’
+ tdfx_sli.c:161:4: warning: pointer targets in passing argument 2 of ‘pci_device_cfg_read_u32’ differ in signedness
+ /var/tmp/jhbuild/include/pciaccess.h:153:5: note: expected ‘uint32_t *’ but argument is of type ‘int *’
+ tdfx_sli.c:163:4: warning: pointer targets in passing argument 2 of ‘pci_device_cfg_read_u32’ differ in signedness
+ /var/tmp/jhbuild/include/pciaccess.h:153:5: note: expected ‘uint32_t *’ but argument is of type ‘int *’
+ tdfx_sli.c:165:4: warning: pointer targets in passing argument 2 of ‘pci_device_cfg_read_u32’ differ in signedness
+ /var/tmp/jhbuild/include/pciaccess.h:153:5: note: expected ‘uint32_t *’ but argument is of type ‘int *’
+ tdfx_sli.c:175:4: warning: pointer targets in passing argument 2 of ‘pci_device_cfg_read_u32’ differ in signedness
+ /var/tmp/jhbuild/include/pciaccess.h:153:5: note: expected ‘uint32_t *’ but argument is of type ‘int *’
+ tdfx_sli.c:275:7: warning: pointer targets in passing argument 2 of ‘pci_device_cfg_read_u32’ differ in signedness
+ /var/tmp/jhbuild/include/pciaccess.h:153:5: note: expected ‘uint32_t *’ but argument is of type ‘int *’
+ tdfx_sli.c:764:2: warning: pointer targets in passing argument 2 of ‘pci_device_cfg_read_u32’ differ in signedness
+ /var/tmp/jhbuild/include/pciaccess.h:153:5: note: expected ‘uint32_t *’ but argument is of type ‘int *’
+ tdfx_sli.c:768:2: warning: pointer targets in passing argument 2 of ‘pci_device_cfg_read_u32’ differ in signedness
+ /var/tmp/jhbuild/include/pciaccess.h:153:5: note: expected ‘uint32_t *’ but argument is of type ‘int *’
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 3cdf7e280c5be1bc72e38460d6c46f4ae04efc37
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sun Oct 9 18:48:15 2011 -0700
+
+ gettimeofday is in <sys/time.h>
+
+ tdfx_priv.c:116:3: warning: implicit declaration of function ‘gettimeofday’
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit f53f5a192025bec5547c2db16741e2a4eda20d74
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sun Oct 9 18:47:27 2011 -0700
+
+ Use malloc/calloc/realloc/free directly
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 0c4ffbec23de9a2b0da9310f1dfca50dcc1f7132
+Author: Jesse Adkins <jesserayadkins@gmail.com>
+Date: Tue Sep 28 13:29:52 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit fb533c0d378e9e4909b46b7d164111c2fe8af942
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jul 21 16:49:04 2010 -0400
+
+ config: add comments for main statements
+
+commit 92c127023eb3cff5064978c482fc30dd266761f2
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jul 21 16:07:00 2010 -0400
+
+ config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 43b1b085c9ed4592e42f586fe720881ca0ed570d
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jul 21 14:37:42 2010 -0400
+
+ config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 6b82567be23fb09f51c57c4c23f5235c5610ba2c
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jul 21 14:05:23 2010 -0400
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 88c8af1c7874882733b5fc423dadc7541bf88f99
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jul 21 09:27:42 2010 -0400
+
+ config: complete AC_INIT m4 quoting
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit f5bba1f1f33967578df85a3b10b9a58f81831678
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Jul 20 21:54:12 2010 -0400
+
+ config: remove unrequired AC_SUBST([DRI_CFLAGS])
+
+ This macro is called by PKG_CHECK_MODULES
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 96cf989952e5d01a44560caa799d7addd2f1b5d2
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Jul 20 21:44:58 2010 -0400
+
+ config: remove unrequired AC_SUBST([XORG_CFLAGS])
+
+ This macro is called by PKG_CHECK_MODULES
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 094f38c3cffc71497abf9769cc4d20536657fd37
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Jul 20 20:24:42 2010 -0400
+
+ config: remove unrequired AC_HEADER_STDC
+
+ Autoconf says:
+ "This macro is obsolescent, as current systems have conforming
+ header files. New programs need not use this macro".
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 51a5af924866d14b868c20a8abdabfaa2a7d7359
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Jul 20 19:41:31 2010 -0400
+
+ config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
+
+ XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
+ AC_PROG_C_C99. This sets gcc with -std=gnu99.
+ If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit b33d5ea736cad6da7de5c89183774ddeca5f885e
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Jul 20 18:45:19 2010 -0400
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit cd1209abe30038f3c46bb51568733f795f17f5a5
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Jul 20 16:15:30 2010 -0400
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+commit 83661e56c332c9e10d1cd0aa7b464dbabedaab4c
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Jun 13 11:30:39 2010 -0400
+
+ COPYING: replace stub file with actual Copyright notices.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 5e06e326b2a48e1ae5da352339ee6c77904ebfbe
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri Jan 15 15:14:13 2010 -0800
+
+ Update Sun license notices to current X.Org standard form
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 0fec5b777bb21012046ec05abf0f92767d43e5fc
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Dec 15 21:47:43 2009 -0500
+
+ configure.ac: use backticks rather than $() for cmd subs
+
+ Use "$PKG_CONFIG" rather than hard coded "pkg-config"
+
+ Acked-by: Dan Nicholson <dbn.lists@gmail.com>
+ Acked-by: Daniel Stone <daniel@fooishbar.org>
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 0ba31dcaab005862e8bdcf2800ae54e3c0eff99a
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Nov 23 09:25:06 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit 7ddfff90b91c6bc8dbe64eff0efdcbb6fea39cab
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Oct 28 14:41:41 2009 -0400
+
+ INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+
+ Automake 'foreign' option is specified in configure.ac.
+ Remove from Makefile.am
+
+commit f7e316031e6cc1475dc6707bdb464cd228cfc460
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Oct 28 14:09:10 2009 -0400
+
+ INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+
+ Add missing INSTALL file. Use standard GNU file on building tarball
+ README may have been updated
+ Remove AUTHORS file as it is empty and no content available yet.
+ Remove NEWS file as it is empty and no content available yet.
+
+commit dbe081091ba868782c1d979f5e588415f05fb861
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Oct 26 12:54:22 2009 -0400
+
+ Several driver modules do not have a ChangeLog target in Makefile.am #23814
+
+ The git generated ChangeLog replaces the hand written one.
+ Update configure.ac to xorg-macros level 1.3.
+ Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros
+ Update Makefile.am to add ChangeLog target if missing
+ Remove ChangeLog from EXTRA_DIST or *CLEAN variables
+ This is a pre-req for the INSTALL_CMD
+
+commit 57449ae05c5f256950c1b2215069c28e4cd7c13f
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Oct 22 13:04:56 2009 -0400
+
+ .gitignore: use common defaults with custom section # 24239
+
+ Using common defaults will reduce errors and maintenance.
+ Only the very small or inexistent custom section need periodic maintenance
+ when the structure of the component changes. Do not edit defaults.
+
+commit c062e25f39c90f8484791df2f7f330d556fcc995
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Oct 22 12:34:18 2009 -0400
+
+ .gitignore: use common defaults with custom section # 24239
+
+ Using common defaults will reduce errors and maintenance.
+ Only the very small or inexistent custom section need periodic maintenance
+ when the structure of the component changes. Do not edit defaults.
+
commit 96ad72682ca7925918e8cb7298a2241dc096bd6f
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jul 30 12:04:30 2009 +1000
diff --git a/debian/changelog b/debian/changelog
index 6f1e3cb..7ec2b31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-tdfx (1:1.4.4-1) UNRELEASED; urgency=low
+
+ * New upstream release:
+ - Fix FTBFS with X server 1.12.
+
+ -- Cyril Brulebois <kibi@debian.org> Mon, 07 May 2012 02:53:55 +0200
+
xserver-xorg-video-tdfx (1:1.4.3-4) unstable; urgency=low
* Switch to dh:
commit 98d24dd99052322c71d1676e6d66c2c724f6066a
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Mar 23 19:59:33 2012 -0700
xf86-video-tdfx 1.4.4
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 9245b41..3ccb489 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-tdfx],
- [1.4.3],
+ [1.4.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-tdfx])
AC_CONFIG_SRCDIR([Makefile.am])
commit a985b54c8559d7ff8f5481004d54989ed7499237
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jan 4 14:57:56 2012 +1000
Untangle XF86DRI from the driver-specific DRI define
XF86DRI is defined by xorg-server.h, so --disable-dri in the driver
itself does exactly nothing other than not fill in the CFLAGS and thus stop
the driver from compiling.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 33ed17c..9245b41 100644
--- a/configure.ac
+++ b/configure.ac
@@ -100,8 +100,8 @@ AC_MSG_RESULT([$DRI])
AM_CONDITIONAL(DRI, test x$DRI = xyes)
if test "$DRI" = yes; then
PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto])
- AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
- AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
+ AC_DEFINE(TDFXDRI,1,[Enable DRI driver support])
+ AC_DEFINE(TDFXDRI_DEVEL,1,[Enable developmental DRI driver support])
fi
if test "x$XSERVER_LIBPCIACCESS" = xyes; then
diff --git a/src/tdfx.h b/src/tdfx.h
index dbdf4c6..2e00fde 100644
--- a/src/tdfx.h
+++ b/src/tdfx.h
@@ -18,7 +18,11 @@
#include "xf86xv.h"
#include "tdfxdefs.h"
-#ifdef XF86DRI
+#ifndef XF86DRI
+#undef TDFXDRI
+#endif
+
+#ifdef TDFXDRI
#include "xf86drm.h"
#include "sarea.h"
#define _XF86DRI_SERVER_
@@ -78,7 +82,7 @@ extern void TDFXLostContext(ScreenPtr pScreen);
extern Bool TDFXSetupSLI(ScrnInfoPtr pScrn, Bool sliEnable, int aaSamples);
extern Bool TDFXDisableSLI(TDFXPtr pTDFX);
-#ifdef XF86DRI
+#ifdef TDFXDRI
extern void FillPrivateDRI(TDFXPtr pTDFX, TDFXDRIPtr pTDFXDRI);
#endif
@@ -250,7 +254,7 @@ typedef struct _TDFXRec {
int scanlineWidth;
unsigned char *scanlineColorExpandBuffers[2];
PROPDATA
-#ifdef XF86DRI
+#ifdef TDFXDRI
Bool directRenderingEnabled;
DRIInfoPtr pDRIInfo;
int drmSubFD;
diff --git a/src/tdfx_accel.c b/src/tdfx_accel.c
index c7aea8c..12472f3 100644
--- a/src/tdfx_accel.c
+++ b/src/tdfx_accel.c
@@ -89,7 +89,7 @@ TDFXFirstSync(ScrnInfoPtr pScrn) {
TDFXPtr pTDFX = TDFXPTR(pScrn);
if (!pTDFX->syncDone) {
-#ifdef XF86DRI
+#ifdef TDFXDRI
if (pTDFX->directRenderingEnabled) {
DRILock(screenInfo.screens[pScrn->scrnIndex], 0);
TDFXSwapContextFifo(screenInfo.screens[pScrn->scrnIndex]);
@@ -107,7 +107,7 @@ TDFXCheckSync(ScrnInfoPtr pScrn) {
if (pTDFX->syncDone) {
pTDFX->sync(pScrn);
pTDFX->syncDone=FALSE;
-#ifdef XF86DRI
+#ifdef TDFXDRI
if (pTDFX->directRenderingEnabled) {
DRIUnlock(screenInfo.screens[pScrn->scrnIndex]);
}
diff --git a/src/tdfx_driver.c b/src/tdfx_driver.c
index 0b3d904..94cce04 100644
--- a/src/tdfx_driver.c
+++ b/src/tdfx_driver.c
@@ -99,7 +99,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "xf86xv.h"
#include <X11/extensions/Xv.h>
-#ifdef XF86DRI
+#ifdef TDFXDRI
#include "dri.h"
#endif
@@ -1230,7 +1230,7 @@ TDFXPreInit(ScrnInfoPtr pScrn, int flags)
pTDFX->writeLong(pTDFX, MISCINIT0, pTDFX->ModeReg.miscinit0);
#endif
-#ifdef XF86DRI
+#ifdef TDFXDRI
/* Load the dri module if requested. */
if (xf86ReturnOptValBool(pTDFX->Options, OPTION_DRI, FALSE)) {
xf86LoadSubModule(pScrn, "dri");
@@ -1908,14 +1908,14 @@ TDFXModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
mode->CrtcHSkew=hskew;
}
-#ifdef XF86DRI
+#ifdef TDFXDRI
if (pTDFX->directRenderingEnabled) {
DRILock(screenInfo.screens[pScrn->scrnIndex], 0);
TDFXSwapContextFifo(screenInfo.screens[pScrn->scrnIndex]);
}
#endif
DoRestore(pScrn, &hwp->ModeReg, &pTDFX->ModeReg, FALSE);
-#ifdef XF86DRI
+#ifdef TDFXDRI
if (pTDFX->directRenderingEnabled) {
DRIUnlock(screenInfo.screens[pScrn->scrnIndex]);
}
@@ -2201,7 +2201,7 @@ TDFXScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) {
TDFXPtr pTDFX;
VisualPtr visual;
BoxRec MemBox;
-#ifdef XF86DRI
+#ifdef TDFXDRI
MessageType driFrom = X_DEFAULT;
#endif
int scanlines;
@@ -2308,7 +2308,7 @@ TDFXScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) {
miSetPixmapDepths ();
-#ifdef XF86DRI
+#ifdef TDFXDRI
/*
* Setup DRI after visuals have been established, but before fbScreenInit
* is called. fbScreenInit will eventually call into the drivers
@@ -2417,7 +2417,7 @@ TDFXScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) {
* in of TDFXCloseScreen() before the rest is unwrapped
*/
-#ifdef XF86DRI
+#ifdef TDFXDRI
if (pTDFX->directRenderingEnabled) {
/* Now that mi, fb, drm and others have done their thing,
* complete the DRI setup.
@@ -2471,7 +2471,7 @@ static Bool
TDFXEnterVT(int scrnIndex, int flags) {
ScrnInfoPtr pScrn;
ScreenPtr pScreen;
-#ifdef XF86DRI
+#ifdef TDFXDRI
TDFXPtr pTDFX;
#endif
@@ -2479,7 +2479,7 @@ TDFXEnterVT(int scrnIndex, int flags) {
pScrn = xf86Screens[scrnIndex];
pScreen = screenInfo.screens[scrnIndex];
TDFXInitFifo(pScreen);
-#ifdef XF86DRI
+#ifdef TDFXDRI
pTDFX = TDFXPTR(pScrn);
if (pTDFX->directRenderingEnabled) {
DRIUnlock(pScreen);
@@ -2506,7 +2506,7 @@ TDFXLeaveVT(int scrnIndex, int flags) {
pTDFX = TDFXPTR(pScrn);
pTDFX->sync(pScrn);
TDFXShutdownFifo(pScreen);
-#ifdef XF86DRI
+#ifdef TDFXDRI
if (pTDFX->directRenderingEnabled) {
DRILock(pScreen, 0);
}
@@ -2525,7 +2525,7 @@ TDFXCloseScreen(int scrnIndex, ScreenPtr pScreen)
hwp = VGAHWPTR(pScrn);
pTDFX = TDFXPTR(pScrn);
-#ifdef XF86DRI
+#ifdef TDFXDRI
if (pTDFX->directRenderingEnabled) {
TDFXDRICloseScreen(pScreen);
pTDFX->directRenderingEnabled=FALSE;
diff --git a/src/tdfx_priv.c b/src/tdfx_priv.c
index 77ce676..d5cb2d1 100644
--- a/src/tdfx_priv.c
+++ b/src/tdfx_priv.c
@@ -234,7 +234,7 @@ GetReadPtr(TDFXPtr pTDFX)
return read_ptr;
}
-#ifdef XF86DRI
+#ifdef TDFXDRI
void TDFXSwapContextFifo(ScreenPtr pScreen)
{
ScrnInfoPtr pScrn;
commit 4d56f3a6a69717b04f46f3e22c3a0834050c1a46
Author: Stefan Dirsch <sndirsch@novell.com>
Date: Thu Jul 30 11:28:28 2009 +0200
Fix RPMLINT warning "64bit-portability-issue".
Signed-off-by: Johannes Obermayr <johannesobermayr@gmx.de>
Reviewed-by: Tormod Volden <debian.tormod@gmail.com>
diff --git a/src/tdfx_dri.c b/src/tdfx_dri.c
index 31a1b43..8198595 100644
--- a/src/tdfx_dri.c
+++ b/src/tdfx_dri.c
@@ -359,7 +359,7 @@ Bool TDFXDRIScreenInit(ScreenPtr pScreen)
pDRIInfo->ddxDriverMajorVersion = TDFX_MAJOR_VERSION;
pDRIInfo->ddxDriverMinorVersion = TDFX_MINOR_VERSION;
pDRIInfo->ddxDriverPatchVersion = TDFX_PATCHLEVEL;
- pDRIInfo->frameBufferPhysicalAddress = pTDFX->LinearAddr[0];
+ pDRIInfo->frameBufferPhysicalAddress = (pointer) pTDFX->LinearAddr[0];
pDRIInfo->frameBufferSize = pTDFX->FbMapSize;
pDRIInfo->frameBufferStride = pTDFX->stride;
pDRIInfo->ddxDrawableTableEntry = TDFX_MAX_DRAWABLES;
commit fe60f0ed2a0647937cc46a45d497bdf7da4061a4
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 19 17:33:17 2011 -0500
Stop uselessly including xf86Priv.h
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/tdfx_dri.c b/src/tdfx_dri.c
index f42e232..31a1b43 100644
--- a/src/tdfx_dri.c
+++ b/src/tdfx_dri.c
@@ -5,7 +5,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86Priv.h"
#include "xf86PciInfo.h"
#include "xf86Pci.h"
#include "fb.h"
commit 5b5d3c8b23865724d4f6d71610760e80e4b032e6
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 19 17:32:27 2011 -0500
Fix for new vgaHW ABI
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/tdfx_driver.c b/src/tdfx_driver.c
index a86d9e8..0b3d904 100644
--- a/src/tdfx_driver.c
+++ b/src/tdfx_driver.c
@@ -824,6 +824,7 @@ TDFXPreInit(ScrnInfoPtr pScrn, int flags)
/* Allocate a vgaHWRec */
if (!vgaHWGetHWRec(pScrn)) return FALSE;
+ vgaHWSetStdFuncs(VGAHWPTR(pScrn));
#if USE_INT10
#if !defined(__powerpc__)
commit 92cb819839a2f37c3e3db4831aa45e5bb9b00651
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 19 17:31:45 2011 -0500
Make failure to XAA non-fatal
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/tdfx_driver.c b/src/tdfx_driver.c
index 8225c6f..a86d9e8 100644
--- a/src/tdfx_driver.c
+++ b/src/tdfx_driver.c
@@ -1103,10 +1103,11 @@ TDFXPreInit(ScrnInfoPtr pScrn, int flags)
return FALSE;
}
- if (!xf86ReturnOptValBool(pTDFX->Options, OPTION_NOACCEL, FALSE)) {
+ pTDFX->NoAccel = xf86ReturnOptValBool(pTDFX->Options, OPTION_NOACCEL, FALSE);
+ if (!pTDFX->NoAccel) {
if (!xf86LoadSubModule(pScrn, "xaa")) {
- TDFXFreeRec(pScrn);
- return FALSE;
+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "No acceleration available\n");
+ pTDFX->NoAccel = TRUE;
}
}
@@ -2306,7 +2307,6 @@ TDFXScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) {
miSetPixmapDepths ();
- pTDFX->NoAccel=xf86ReturnOptValBool(pTDFX->Options, OPTION_NOACCEL, FALSE);
#ifdef XF86DRI
/*
* Setup DRI after visuals have been established, but before fbScreenInit
commit 4ea96c222ad0900ad53f506e485588e2a49a22f4
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Nov 17 15:54:27 2011 -0500
Check ABI major not encoded ABI
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/tdfx_driver.c b/src/tdfx_driver.c
index 65c6709..8225c6f 100644
--- a/src/tdfx_driver.c
+++ b/src/tdfx_driver.c
@@ -104,7 +104,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#endif
#define USE_INT10 1
-#define USE_PCIVGAIO (ABI_VIDEODRV_VERSION < 12)
+#define USE_PCIVGAIO (GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12)
/* Required Functions: */
commit 32cd2dfa1214ed3260bf2e40bad06927b18f7f7b
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Nov 16 14:44:02 2011 -0500
Adapt to missing PIOOffset in vgahw
This is actually pretty lame, and I should probably extend vgahw to make
it easier to do this kind of trick.
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/tdfx_driver.c b/src/tdfx_driver.c
index 673bbc7..65c6709 100644
--- a/src/tdfx_driver.c
+++ b/src/tdfx_driver.c
@@ -6,9 +6,6 @@
#include <inttypes.h>
#endif
-#define USE_INT10 1
-#define USE_PCIVGAIO 1
-
/**************************************************************************
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -106,6 +103,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "dri.h"
#endif
+#define USE_INT10 1
+#define USE_PCIVGAIO (ABI_VIDEODRV_VERSION < 12)
+
/* Required Functions: */
static const OptionInfoRec * TDFXAvailableOptions(int chipid, int busid);
commit d7be4a953859f12083c1743c73712f9f510d7fda
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Oct 19 00:41:56 2011 -0700
Use unsigned long rather than deprecated IOADDRESS
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/src/tdfx.h b/src/tdfx.h
index 15f6d11..dbdf4c6 100644
--- a/src/tdfx.h
+++ b/src/tdfx.h
@@ -191,7 +191,7 @@ typedef struct _TDFXRec {
unsigned char *FbBase;
unsigned char *myFbBase;
#endif
- IOADDRESS PIOBase[MAXCHIPS];
+ unsigned long PIOBase[MAXCHIPS];
long FbMapSize;
int pixelFormat;
int stride;
commit 3a97ecb50f326dbe0e1a3b3656806a8a2d2a1c3d
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Oct 9 18:46:10 2011 -0700
Fix compiler warnings about signedness
tdfx_sli.c:23:7: warning: pointer targets in passing argument 2 of ‘pci_device_cfg_read_u32’ differ in signedness
/var/tmp/jhbuild/include/pciaccess.h:153:5: note: expected ‘uint32_t *’ but argument is of type ‘int *’
tdfx_sli.c:31:7: warning: pointer targets in passing argument 2 of ‘pci_device_cfg_read_u32’ differ in signedness
/var/tmp/jhbuild/include/pciaccess.h:153:5: note: expected ‘uint32_t *’ but argument is of type ‘int *’
tdfx_sli.c:40:7: warning: pointer targets in passing argument 2 of ‘pci_device_cfg_read_u32’ differ in signedness
/var/tmp/jhbuild/include/pciaccess.h:153:5: note: expected ‘uint32_t *’ but argument is of type ‘int *’
tdfx_sli.c:45:7: warning: pointer targets in passing argument 2 of ‘pci_device_cfg_read_u32’ differ in signedness
/var/tmp/jhbuild/include/pciaccess.h:153:5: note: expected ‘uint32_t *’ but argument is of type ‘int *’
tdfx_sli.c: In function ‘TDFXSetupSLI’:
tdfx_sli.c:155:2: warning: pointer targets in passing argument 2 of ‘pci_device_cfg_read_u32’ differ in signedness
/var/tmp/jhbuild/include/pciaccess.h:153:5: note: expected ‘uint32_t *’ but argument is of type ‘int *’
tdfx_sli.c:161:4: warning: pointer targets in passing argument 2 of ‘pci_device_cfg_read_u32’ differ in signedness
/var/tmp/jhbuild/include/pciaccess.h:153:5: note: expected ‘uint32_t *’ but argument is of type ‘int *’
tdfx_sli.c:163:4: warning: pointer targets in passing argument 2 of ‘pci_device_cfg_read_u32’ differ in signedness
/var/tmp/jhbuild/include/pciaccess.h:153:5: note: expected ‘uint32_t *’ but argument is of type ‘int *’
tdfx_sli.c:165:4: warning: pointer targets in passing argument 2 of ‘pci_device_cfg_read_u32’ differ in signedness
/var/tmp/jhbuild/include/pciaccess.h:153:5: note: expected ‘uint32_t *’ but argument is of type ‘int *’
tdfx_sli.c:175:4: warning: pointer targets in passing argument 2 of ‘pci_device_cfg_read_u32’ differ in signedness
/var/tmp/jhbuild/include/pciaccess.h:153:5: note: expected ‘uint32_t *’ but argument is of type ‘int *’
tdfx_sli.c:275:7: warning: pointer targets in passing argument 2 of ‘pci_device_cfg_read_u32’ differ in signedness
/var/tmp/jhbuild/include/pciaccess.h:153:5: note: expected ‘uint32_t *’ but argument is of type ‘int *’
tdfx_sli.c:764:2: warning: pointer targets in passing argument 2 of ‘pci_device_cfg_read_u32’ differ in signedness
/var/tmp/jhbuild/include/pciaccess.h:153:5: note: expected ‘uint32_t *’ but argument is of type ‘int *’
tdfx_sli.c:768:2: warning: pointer targets in passing argument 2 of ‘pci_device_cfg_read_u32’ differ in signedness
/var/tmp/jhbuild/include/pciaccess.h:153:5: note: expected ‘uint32_t *’ but argument is of type ‘int *’
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/src/tdfx_sli.c b/src/tdfx_sli.c
index 416edca..1507515 100644
--- a/src/tdfx_sli.c
+++ b/src/tdfx_sli.c
@@ -17,7 +17,7 @@
Bool TDFXDisableSLI(TDFXPtr pTDFX)
{
int i;
- int v;
+ uint32_t v;
for (i=0; i<pTDFX->numChips; i++) {
PCI_READ_LONG(v, CFG_INIT_ENABLE, i);
@@ -83,7 +83,8 @@ Bool TDFXDisableSLI(TDFXPtr pTDFX)
Bool TDFXSetupSLI(ScrnInfoPtr pScrn, Bool sliEnable, int aaSamples)
{
TDFXPtr pTDFX;
- int i, sliLines, sliLinesLog2, nChipsLog2, v;
+ uint32_t v;
+ int i, sliLines, sliLinesLog2, nChipsLog2;
int sli_renderMask, sli_compareMask, sli_scanMask;
int sliAnalog, dwFormat;
commit 3cdf7e280c5be1bc72e38460d6c46f4ae04efc37
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Oct 9 18:48:15 2011 -0700
gettimeofday is in <sys/time.h>
tdfx_priv.c:116:3: warning: implicit declaration of function ‘gettimeofday’
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/src/tdfx_priv.c b/src/tdfx_priv.c
index 5fca911..77ce676 100644
--- a/src/tdfx_priv.c
+++ b/src/tdfx_priv.c
@@ -3,6 +3,8 @@
#include "config.h"
#endif
+#include <sys/time.h>
+
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86fbman.h"
commit f53f5a192025bec5547c2db16741e2a4eda20d74
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Oct 9 18:47:27 2011 -0700
Use malloc/calloc/realloc/free directly
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/src/tdfx_accel.c b/src/tdfx_accel.c
index 6191aeb..c7aea8c 100644
--- a/src/tdfx_accel.c
+++ b/src/tdfx_accel.c
@@ -254,8 +254,8 @@ TDFXAccelInit(ScreenPtr pScreen)
infoPtr->ScreenToScreenCopyFlags = commonFlags;
/* When we're using the fifo we have to use indirect expansion */
- pTDFX->scanlineColorExpandBuffers[0] = xalloc((pScrn->virtualX+62)/32*4);
- pTDFX->scanlineColorExpandBuffers[1] = xalloc((pScrn->virtualX+62)/32*4);
+ pTDFX->scanlineColorExpandBuffers[0] = malloc((pScrn->virtualX+62)/32*4);
+ pTDFX->scanlineColorExpandBuffers[1] = malloc((pScrn->virtualX+62)/32*4);
infoPtr->NumScanlineColorExpandBuffers=2;
infoPtr->ScanlineColorExpandBuffers=pTDFX->scanlineColorExpandBuffers;
infoPtr->SetupForScanlineCPUToScreenColorExpandFill =
diff --git a/src/tdfx_dga.c b/src/tdfx_dga.c
index f88c09b..0fae286 100644
--- a/src/tdfx_dga.c
+++ b/src/tdfx_dga.c
@@ -48,10 +48,10 @@ TDFXDGAInit(ScreenPtr pScreen)
pMode = firstMode = pScrn->modes;
while (pMode) {
- newmodes = xrealloc(modes, (num+1)*sizeof(DGAModeRec));
+ newmodes = realloc(modes, (num+1)*sizeof(DGAModeRec));
if (!newmodes) {
- xfree(modes);
+ free(modes);
return FALSE;
}
modes = newmodes;
diff --git a/src/tdfx_dri.c b/src/tdfx_dri.c
index 220e910..f42e232 100644
--- a/src/tdfx_dri.c
+++ b/src/tdfx_dri.c
@@ -53,19 +53,19 @@ TDFXInitVisualConfigs(ScreenPtr pScreen)
case 16:
numConfigs = 16;
- if (!(pConfigs = (__GLXvisualConfig*)xcalloc(sizeof(__GLXvisualConfig),
+ if (!(pConfigs = (__GLXvisualConfig*)calloc(sizeof(__GLXvisualConfig),
numConfigs))) {
return FALSE;
}
- if (!(pTDFXConfigs = (TDFXConfigPrivPtr)xcalloc(sizeof(TDFXConfigPrivRec),
+ if (!(pTDFXConfigs = (TDFXConfigPrivPtr)calloc(sizeof(TDFXConfigPrivRec),
numConfigs))) {
- xfree(pConfigs);
+ free(pConfigs);
return FALSE;
}
- if (!(pTDFXConfigPtrs = (TDFXConfigPrivPtr*)xcalloc(sizeof(TDFXConfigPrivPtr),
+ if (!(pTDFXConfigPtrs = (TDFXConfigPrivPtr*)calloc(sizeof(TDFXConfigPrivPtr),
numConfigs))) {
- xfree(pConfigs);
- xfree(pTDFXConfigs);
+ free(pConfigs);
+ free(pTDFXConfigs);
return FALSE;
}
for (i=0; i<numConfigs; i++)
@@ -144,20 +144,20 @@ TDFXInitVisualConfigs(ScreenPtr pScreen)
case 32:
numConfigs = 8;
- pConfigs = (__GLXvisualConfig*) xcalloc(sizeof(__GLXvisualConfig), numConfigs);
+ pConfigs = (__GLXvisualConfig*) calloc(sizeof(__GLXvisualConfig), numConfigs);
if (!pConfigs)
return FALSE;
- pTDFXConfigs = (TDFXConfigPrivPtr) xcalloc(sizeof(TDFXConfigPrivRec), numConfigs);
+ pTDFXConfigs = (TDFXConfigPrivPtr) calloc(sizeof(TDFXConfigPrivRec), numConfigs);
if (!pTDFXConfigs) {
- xfree(pConfigs);
+ free(pConfigs);
return FALSE;
}
- pTDFXConfigPtrs = (TDFXConfigPrivPtr *) xcalloc(sizeof(TDFXConfigPrivPtr), numConfigs);
+ pTDFXConfigPtrs = (TDFXConfigPrivPtr *) calloc(sizeof(TDFXConfigPrivPtr), numConfigs);
if (!pTDFXConfigPtrs) {
- xfree(pConfigs);
- xfree(pTDFXConfigs);
+ free(pConfigs);
+ free(pTDFXConfigs);
return FALSE;
}
@@ -350,7 +350,7 @@ Bool TDFXDRIScreenInit(ScreenPtr pScreen)
if (xf86LoaderCheckSymbol("DRICreatePCIBusID")) {
pDRIInfo->busIdString = DRICreatePCIBusID(pTDFX->PciInfo);
} else {
- pDRIInfo->busIdString = xalloc(64);
+ pDRIInfo->busIdString = malloc(64);
sprintf(pDRIInfo->busIdString, "PCI:%d:%d:%d",
Reply to: