xserver-xorg-video-tdfx: Changes to 'upstream-unstable'
.gitignore | 70 +++++++++++++++++++++++++++++++++++++++++++++----
COPYING | 27 +++++++++++++------
ChangeLog | 76 ------------------------------------------------------
Makefile.am | 11 +++++++
configure.ac | 55 +++++++++++++++++++--------------------
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 +++++++++----------
17 files changed, 228 insertions(+), 246 deletions(-)
New commits:
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",
((pciConfigPtr)pTDFX->PciInfo->thisCard)->busnum,
((pciConfigPtr)pTDFX->PciInfo->thisCard)->devnum,
@@ -395,7 +395,7 @@ Bool TDFXDRIScreenInit(ScreenPtr pScreen)
pDRIInfo->SAREASize = SAREA_MAX;
#endif
- if (!(pTDFXDRI = (TDFXDRIPtr)xcalloc(sizeof(TDFXDRIRec),1))) {
+ if (!(pTDFXDRI = (TDFXDRIPtr)calloc(sizeof(TDFXDRIRec),1))) {
xf86DrvMsg(pScreen->myNum, X_ERROR,
"[dri] DRI memory allocation failed, disabling DRI.\n");
DRIDestroyInfoRec(pTDFX->pDRIInfo);
@@ -421,7 +421,7 @@ Bool TDFXDRIScreenInit(ScreenPtr pScreen)
pDRIInfo->createDummyCtxPriv = FALSE;
if (!DRIScreenInit(pScreen, pDRIInfo, &pTDFX->drmSubFD)) {
- xfree(pDRIInfo->devPrivate);
+ free(pDRIInfo->devPrivate);
pDRIInfo->devPrivate=0;
DRIDestroyInfoRec(pTDFX->pDRIInfo);
pTDFX->pDRIInfo=0;
@@ -483,14 +483,14 @@ TDFXDRICloseScreen(ScreenPtr pScreen)
if (pTDFX->pDRIInfo) {
if (pTDFX->pDRIInfo->devPrivate) {
- xfree(pTDFX->pDRIInfo->devPrivate);
+ free(pTDFX->pDRIInfo->devPrivate);
pTDFX->pDRIInfo->devPrivate=0;
}
DRIDestroyInfoRec(pTDFX->pDRIInfo);
pTDFX->pDRIInfo=0;
}
- if (pTDFX->pVisualConfigs) xfree(pTDFX->pVisualConfigs);
- if (pTDFX->pVisualConfigsPriv) xfree(pTDFX->pVisualConfigsPriv);
+ if (pTDFX->pVisualConfigs) free(pTDFX->pVisualConfigs);
+ if (pTDFX->pVisualConfigsPriv) free(pTDFX->pVisualConfigsPriv);
}
static Bool
diff --git a/src/tdfx_driver.c b/src/tdfx_driver.c
index 8935505..673bbc7 100644
--- a/src/tdfx_driver.c
+++ b/src/tdfx_driver.c
@@ -306,7 +306,7 @@ static void
TDFXFreeRec(ScrnInfoPtr pScrn) {
if (!pScrn) return;
if (!pScrn->driverPrivate) return;
- xfree(pScrn->driverPrivate);
+ free(pScrn->driverPrivate);
pScrn->driverPrivate=0;
}
@@ -429,7 +429,7 @@ TDFXProbe(DriverPtr drv, int flags)
devSections, numDevSections,
drv, &usedChips);
- xfree(devSections);
+ free(devSections);
if (numUsed<=0) return FALSE;
if (flags & PROBE_DETECT)
@@ -457,7 +457,7 @@ TDFXProbe(DriverPtr drv, int flags)
foundScreen = TRUE;
}
}
- xfree(usedChips);
+ free(usedChips);
return foundScreen;
}
@@ -927,7 +927,7 @@ TDFXPreInit(ScrnInfoPtr pScrn, int flags)
/* Process the options */
xf86CollectOptions(pScrn, NULL);
- if (!(pTDFX->Options = xalloc(sizeof(TDFXOptions))))
+ if (!(pTDFX->Options = malloc(sizeof(TDFXOptions))))
return FALSE;
memcpy(pTDFX->Options, TDFXOptions, sizeof(TDFXOptions));
xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pTDFX->Options);
@@ -1682,7 +1682,7 @@ TDFXInitWithBIOSData(ScrnInfoPtr pScrn)
}
#define T_B_SIZE (64 * 1024)
- bios = xcalloc(T_B_SIZE, 1);
+ bios = calloc(T_B_SIZE, 1);
if (!bios)
return FALSE;
@@ -1692,7 +1692,7 @@ TDFXInitWithBIOSData(ScrnInfoPtr pScrn)
if (!xf86ReadPciBIOS(0, pTDFX->PciTag[0], 1, bios, T_B_SIZE)) {
#if 0
xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Bad BIOS read.\n");
- xfree(bios);
+ free(bios);
return FALSE;
#endif
}
@@ -1700,7 +1700,7 @@ TDFXInitWithBIOSData(ScrnInfoPtr pScrn)
if (bios[0] != 0x55 || bios[1] != 0xAA) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Bad BIOS signature.\n");
- xfree(bios);
+ free(bios);
return FALSE;
}
@@ -1744,7 +1744,7 @@ TDFXInitWithBIOSData(ScrnInfoPtr pScrn)
pTDFX->writeLong(pTDFX, MISCINIT0, 0xF3);
pTDFX->writeLong(pTDFX, MISCINIT0, uint[1]);
- xfree(bios);
+ free(bios);
return TRUE;
}
#endif
@@ -2542,19 +2542,19 @@ TDFXCloseScreen(int scrnIndex, ScreenPtr pScreen)
if (pTDFX->AccelInfoRec) XAADestroyInfoRec(pTDFX->AccelInfoRec);
pTDFX->AccelInfoRec=0;
- if (pTDFX->DGAModes) xfree(pTDFX->DGAModes);
+ if (pTDFX->DGAModes) free(pTDFX->DGAModes);
pTDFX->DGAModes=0;
if (pTDFX->scanlineColorExpandBuffers[0])
- xfree(pTDFX->scanlineColorExpandBuffers[0]);
+ free(pTDFX->scanlineColorExpandBuffers[0]);
pTDFX->scanlineColorExpandBuffers[0]=0;
if (pTDFX->scanlineColorExpandBuffers[1])
- xfree(pTDFX->scanlineColorExpandBuffers[1]);
+ free(pTDFX->scanlineColorExpandBuffers[1]);
pTDFX->scanlineColorExpandBuffers[1]=0;
if (pTDFX->overlayAdaptor)
- xfree(pTDFX->overlayAdaptor);
+ free(pTDFX->overlayAdaptor);
pTDFX->overlayAdaptor=0;
if (pTDFX->textureAdaptor)
- xfree(pTDFX->textureAdaptor);
+ free(pTDFX->textureAdaptor);
pTDFX->textureAdaptor=0;
pScrn->vtSema=FALSE;
diff --git a/src/tdfx_priv.c b/src/tdfx_priv.c
index 3f3228b..5fca911 100644
--- a/src/tdfx_priv.c
+++ b/src/tdfx_priv.c
@@ -197,7 +197,7 @@ Bool TDFXInitFifo(ScreenPtr pScreen)
#endif
pTDFX->fifoBase = (uint32*)(pTDFX->FbBase+pTDFX->fifoOffset);
#ifdef DEBUG_FIFO
- pTDFX->fifoMirrorBase = xalloc(pTDFX->fifoSize);
+ pTDFX->fifoMirrorBase = malloc(pTDFX->fifoSize);
pTDFX->fifoMirrorPtr = pTDFX->fifoMirrorBase;
#endif
pTDFX->sync=TDFXSyncFifo;
@@ -215,7 +215,7 @@ void TDFXShutdownFifo(ScreenPtr pScreen)
TDFXWriteLongMMIO(pTDFX, SST_FIFO_BASESIZE0, 0);
pTDFX->sync=TDFXSync;
#ifdef DEBUG_FIFO
- if (pTDFX->fifoMirrorBase) xfree(pTDFX->fifoMirrorBase);
+ if (pTDFX->fifoMirrorBase) free(pTDFX->fifoMirrorBase);
pTDFX->fifoMirrorBase=0;
#endif
}
diff --git a/src/tdfx_video.c b/src/tdfx_video.c
index 22be0d3..733e6c7 100644
--- a/src/tdfx_video.c
+++ b/src/tdfx_video.c
@@ -151,7 +151,7 @@ void TDFXInitVideo(ScreenPtr pScreen)
adaptors = &newAdaptor;
} else {
newAdaptors =
- xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
+ malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
if(newAdaptors) {
memcpy(newAdaptors, adaptors, num_adaptors *
sizeof(XF86VideoAdaptorPtr));
@@ -166,7 +166,7 @@ void TDFXInitVideo(ScreenPtr pScreen)
xf86XVScreenInit(pScreen, adaptors, num_adaptors);
if(newAdaptors)
- xfree(newAdaptors);
+ free(newAdaptors);
}
@@ -185,9 +185,9 @@ TDFXAllocAdaptor(ScrnInfoPtr pScrn, int numberPorts)
if(!(adapt = xf86XVAllocateVideoAdaptorRec(pScrn)))
return NULL;
- if(!(pPriv = xcalloc(1, sizeof(TDFXPortPrivRec) + (numberPorts * sizeof(DevUnion)))))
+ if(!(pPriv = calloc(1, sizeof(TDFXPortPrivRec) + (numberPorts * sizeof(DevUnion)))))
{
- xfree(adapt);
+ free(adapt);
return NULL;
}
@@ -1185,18 +1185,18 @@ TDFXAllocateSurface(
surface->width = w;
surface->height = h;
- if(!(surface->pitches = xalloc(sizeof(int)))) {
+ if(!(surface->pitches = malloc(sizeof(int)))) {
xf86FreeOffscreenLinear(linear);
return BadAlloc;
}
- if(!(surface->offsets = xalloc(sizeof(int)))) {
- xfree(surface->pitches);
+ if(!(surface->offsets = malloc(sizeof(int)))) {
+ free(surface->pitches);
xf86FreeOffscreenLinear(linear);
return BadAlloc;
}
- if(!(pPriv = xalloc(sizeof(OffscreenPrivRec)))) {
- xfree(surface->pitches);
- xfree(surface->offsets);
+ if(!(pPriv = malloc(sizeof(OffscreenPrivRec)))) {
+ free(surface->pitches);
+ free(surface->offsets);
xf86FreeOffscreenLinear(linear);
return BadAlloc;
}
@@ -1239,9 +1239,9 @@ TDFXFreeSurface(
if(pPriv->isOn)
TDFXStopSurface(surface);
xf86FreeOffscreenLinear(pPriv->linear);
- xfree(surface->pitches);
- xfree(surface->offsets);
- xfree(surface->devPrivate.ptr);
+ free(surface->pitches);
+ free(surface->offsets);
+ free(surface->devPrivate.ptr);
return Success;
}
@@ -1332,7 +1332,7 @@ TDFXInitOffscreenImages(ScreenPtr pScreen)
XF86OffscreenImagePtr offscreenImages;
/* need to free this someplace */
- if(!(offscreenImages = xalloc(sizeof(XF86OffscreenImageRec))))
+ if(!(offscreenImages = malloc(sizeof(XF86OffscreenImageRec))))
return;
offscreenImages[0].image = &OverlayImages[0];
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>
diff --git a/man/tdfx.man b/man/tdfx.man
index e78bd48..bf9e809 100644
--- a/man/tdfx.man
+++ b/man/tdfx.man
@@ -1,4 +1,3 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx.man,v 1.2 2001/01/27 18:20:55 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH TDFX __drivermansuffix__ __vendorversion__
commit fb533c0d378e9e4909b46b7d164111c2fe8af942
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 16:49:04 2010 -0400
config: add comments for main statements
diff --git a/configure.ac b/configure.ac
index 8f84f6f..33ed17c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,18 +20,18 @@
#
# Process this file with autoconf to produce a configure script
+# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-tdfx],
[1.4.3],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-tdfx])
-
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(.)
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
-
AM_MAINTAINER_MODE
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
@@ -40,12 +40,13 @@ m4_ifndef([XORG_MACROS_VERSION],
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
-# Checks for programs.
+# Initialize libtool
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AH_TOP([#include "xorg-server.h"])
+# Define a configure option for an alternate module directory
AC_ARG_WITH(xorg-module-dir,
AS_HELP_STRING([--with-xorg-module-dir=DIR],
[Default xorg module directory [[default=$libdir/xorg/modules]]]),
@@ -57,13 +58,13 @@ AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri],
[DRI="$enableval"],
[DRI=auto])
-# Checks for extensions
+# Store the list of server defined optional extensions in REQUIRED_MODULES
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
XORG_DRIVER_CHECK_EXT(XV, videoproto)
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
-# Checks for pkg-config packages
+# Obtain compiler/linker options for the driver dependencies
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
@@ -75,7 +76,6 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
[#include "xorg-server.h"])
CPPFLAGS="$SAVE_CPPFLAGS"
-
if test "$DRI" != no; then
AC_CHECK_FILE([${sdkdir}/dri.h],
[have_dri_h="yes"], [have_dri_h="no"])
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>
diff --git a/configure.ac b/configure.ac
index 2d9d2c8..8f84f6f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -115,8 +115,9 @@ AC_SUBST([moduledir])
DRIVER_NAME=tdfx
AC_SUBST([DRIVER_NAME])
-AC_OUTPUT([
- Makefile
- src/Makefile
- man/Makefile
+AC_CONFIG_FILES([
+ Makefile
+ src/Makefile
+ man/Makefile
])
+AC_OUTPUT
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>
diff --git a/configure.ac b/configure.ac
index d057e74..2d9d2c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,12 +47,12 @@ AC_PROG_LIBTOOL
AH_TOP([#include "xorg-server.h"])
AC_ARG_WITH(xorg-module-dir,
- AC_HELP_STRING([--with-xorg-module-dir=DIR],
+ AS_HELP_STRING([--with-xorg-module-dir=DIR],
[Default xorg module directory [[default=$libdir/xorg/modules]]]),
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
-AC_ARG_ENABLE(dri, AC_HELP_STRING([--disable-dri],
+AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri],
[Disable DRI support [[default=auto]]]),
[DRI="$enableval"],
[DRI=auto])
commit 6b82567be23fb09f51c57c4c23f5235c5610ba2c
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 14:05:23 2010 -0400
Reply to: