xserver-xorg-video-tdfx: Changes to 'upstream-unstable'
README | 20 ++++++++
configure.ac | 2
man/tdfx.man | 2
src/tdfx_driver.c | 124 ++----------------------------------------------------
4 files changed, 28 insertions(+), 120 deletions(-)
New commits:
commit 96ad72682ca7925918e8cb7298a2241dc096bd6f
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jul 30 12:04:30 2009 +1000
tdfx: bump for release 1.4.3
diff --git a/configure.ac b/configure.ac
index 6ceb94f..f2949ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-tdfx],
- 1.4.2,
+ 1.4.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-tdfx)
commit 690aaaedb3cf6e8241cad802651a640277094f22
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 15:22:41 2009 +1000
tdfx: change to using ABI version check
diff --git a/src/tdfx_driver.c b/src/tdfx_driver.c
index a3435f5..8935505 100644
--- a/src/tdfx_driver.c
+++ b/src/tdfx_driver.c
@@ -54,7 +54,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "xf86.h"
#include "xf86_OSproc.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86Resources.h"
#include "xf86RAC.h"
#endif
commit 7149d16ed17c064cc91cb1473f10e8e80055347c
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 13:32:38 2009 +1000
tdfx: update for resources/RAC API removal
diff --git a/src/tdfx_driver.c b/src/tdfx_driver.c
index 76ffa51..a3435f5 100644
--- a/src/tdfx_driver.c
+++ b/src/tdfx_driver.c
@@ -54,8 +54,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "xf86.h"
#include "xf86_OSproc.h"
+#ifndef XSERVER_LIBPCIACCESS
#include "xf86Resources.h"
#include "xf86RAC.h"
+#endif
#include "vbe.h"
#include "xf86cmap.h"
@@ -855,10 +857,12 @@ TDFXPreInit(ScrnInfoPtr pScrn, int flags)
pTDFX->Primary = xf86IsPrimaryPci(pTDFX->PciInfo);
#endif
+#ifndef XSERVER_LIBPCIACCESS
if (xf86RegisterResources(pTDFX->pEnt->index, NULL, ResExclusive)) {
TDFXFreeRec(pScrn);
return FALSE;
}
+
/*
* We don't need VGA resources during OPERATING state. However I'm
* not sure if they are disabled.
@@ -876,7 +880,7 @@ TDFXPreInit(ScrnInfoPtr pScrn, int flags)
pScrn->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
} else
pScrn->racMemFlags = 0;
-
+#endif
/* Set pScrn->monitor */
pScrn->monitor = pScrn->confScreen->monitor;
commit b656f6522f287efb8595509c678ce6ec60843944
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 2 11:48:35 2009 -0400
tdfx 1.4.2
diff --git a/configure.ac b/configure.ac
index 6df2ebc..6ceb94f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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)
commit 871db4476dedf77e440a4ef121643bb2eb897254
Author: Adam Jackson <ajax@redhat.com>
Date: Thu May 28 15:21:22 2009 -0400
Remove useless loader symbol lists.
diff --git a/src/tdfx_driver.c b/src/tdfx_driver.c
index ee4b919..76ffa51 100644
--- a/src/tdfx_driver.c
+++ b/src/tdfx_driver.c
@@ -239,95 +239,6 @@ static const OptionInfoRec TDFXOptions[] = {
{ -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 @@ tdfxSetup(pointer module, pointer opts, int *errmaj, int *errmin)
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 @@ TDFXPreInit(ScrnInfoPtr pScrn, int flags)
/* 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 @@ TDFXPreInit(ScrnInfoPtr pScrn, int flags)
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 @@ TDFXPreInit(ScrnInfoPtr pScrn, int flags)
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 @@ TDFXPreInit(ScrnInfoPtr pScrn, int flags)
TDFXFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
/* Load DDC and I2C for monitor ID */
@@ -1247,13 +1136,11 @@ TDFXPreInit(ScrnInfoPtr pScrn, int flags)
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 @@ TDFXPreInit(ScrnInfoPtr pScrn, int flags)
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 @@ TDFXPreInit(ScrnInfoPtr pScrn, int flags)
#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;
commit 5fd80e29b10b9e9b6c5ad4a2ecdf5d9b4013a9e4
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 30 21:04:39 2009 -0800
Add README with pointers to mailing list, bugzilla & git repos
diff --git a/README b/README
new file mode 100644
index 0000000..ceb0741
--- /dev/null
+++ b/README
@@ -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
commit 86c9439917cab56c2b0eef6cd5fd6d8fad886c33
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 9 16:36:56 2009 -0800
Remove xorgconfig & xorgcfg from See Also list in man page
diff --git a/man/tdfx.man b/man/tdfx.man
index be11ae5..e78bd48 100644
--- a/man/tdfx.man
+++ b/man/tdfx.man
@@ -60,6 +60,6 @@ Default: off.
.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: ...
Reply to: