xserver-xorg-video-trident: Changes to 'upstream-unstable'
README | 20 ++++++++
configure.ac | 6 ++
man/trident.man | 2
src/trident_driver.c | 119 +++++++--------------------------------------------
src/trident_shadow.c | 1
src/trident_video.c | 1
6 files changed, 43 insertions(+), 106 deletions(-)
New commits:
commit 33fc86bade1c638300f1b17236cb0b0a492ac6d0
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Aug 5 10:26:35 2009 +1000
bump to 1.3.3 for release
diff --git a/configure.ac b/configure.ac
index 4557538..a53fd69 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-trident],
- 1.3.2,
+ 1.3.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-trident)
commit 3008fa244f8fdf8bf3306dd8c3b781221885ec1b
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 15:22:41 2009 +1000
trident: change to using ABI version check
diff --git a/src/trident_driver.c b/src/trident_driver.c
index e745069..addb1af 100644
--- a/src/trident_driver.c
+++ b/src/trident_driver.c
@@ -39,7 +39,7 @@
#include "micmap.h"
#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 314cb60172135abb5efe40fd0a0e6837f2662780
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 13:32:39 2009 +1000
trident: update for resources/RAC API removal
diff --git a/src/trident_driver.c b/src/trident_driver.c
index 79afa2f..e745069 100644
--- a/src/trident_driver.c
+++ b/src/trident_driver.c
@@ -39,12 +39,15 @@
#include "micmap.h"
#include "xf86.h"
#include "xf86_OSproc.h"
+#ifndef XSERVER_LIBPCIACCESS
#include "xf86Resources.h"
+#include "xf86RAC.h"
+#endif
#include "xf86PciInfo.h"
#include "xf86Pci.h"
#include "xf86cmap.h"
#include "vgaHW.h"
-#include "xf86RAC.h"
+
#include "vbe.h"
#include "dixstruct.h"
#include "compiler.h"
@@ -1016,7 +1019,9 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags)
/* This is the general case */
for (i = 0; i<pScrn->numEntities; i++) {
pTrident->pEnt = xf86GetEntityInfo(pScrn->entityList[i]);
+#ifndef XSERVER_LIBPCIACCESS
if (pTrident->pEnt->resources) return FALSE;
+#endif
pTrident->Chipset = pTrident->pEnt->chipset;
pScrn->chipset = (char *)xf86TokenToString(TRIDENTChipsets,
pTrident->pEnt->chipset);
@@ -1105,7 +1110,9 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags)
vgaIOBase = hwp->IOBase;
pTrident->PIOBase = hwp->PIOOffset;
+#ifndef XSERVER_LIBPCIACCESS
xf86SetOperatingState(resVga, pTrident->pEnt->index, ResUnusedOpr);
+#endif
/* The ramdac module should be loaded here when needed */
if (!xf86LoadSubModule(pScrn, "ramdac"))
@@ -1447,13 +1454,14 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags)
(unsigned long)pTrident->IOAddress);
}
+#ifndef XSERVER_LIBPCIACCESS
/* Register the PCI-assigned resources. */
if (xf86RegisterResources(pTrident->pEnt->index, NULL, ResExclusive)) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"xf86RegisterResources() found resource conflicts\n");
return FALSE;
}
-
+#endif
/* Initialize VBE if possible
* Don't move this past MMIO enable!!
* PIO access will be blocked
@@ -2432,13 +2440,14 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags)
TRIDENTUnmapMem(pScrn);
}
+#ifndef XSERVER_LIBPCIACCESS
pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
if (pTrident->IsCyber && pTrident->MMIOonly)
pScrn->racIoFlags = 0;
else
pScrn->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
-
+#endif
pTrident->FbMapSize = pScrn->videoRam * 1024;
return TRUE;
diff --git a/src/trident_shadow.c b/src/trident_shadow.c
index d2169c8..6a86f7c 100644
--- a/src/trident_shadow.c
+++ b/src/trident_shadow.c
@@ -10,7 +10,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86Resources.h"
#include "xf86PciInfo.h"
#include "xf86Pci.h"
#include "shadowfb.h"
diff --git a/src/trident_video.c b/src/trident_video.c
index 7b6fb10..0c5497b 100644
--- a/src/trident_video.c
+++ b/src/trident_video.c
@@ -28,7 +28,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86Resources.h"
#include "compiler.h"
#include "xf86PciInfo.h"
#include "xf86Pci.h"
commit 6ef2f6e2e7628311e25d2fe35452372cd03bfb57
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 16 11:57:17 2009 +1000
Update to xextproto 7.1 support.
DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers
need to include dpmsconst.h if xextproto 7.1 is available.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index e6c55f7..4557538 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,6 +56,10 @@ XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
+ HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
+ HAVE_XEXTPROTO_71="no")
+AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
save_CFLAGS="$CFLAGS"
diff --git a/src/trident_driver.c b/src/trident_driver.c
index 8ee2b8f..79afa2f 100644
--- a/src/trident_driver.c
+++ b/src/trident_driver.c
@@ -62,8 +62,13 @@
#endif
#include "globals.h"
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
+#endif
+
#include "xf86xv.h"
commit 51d9968f5084f3c38c7459d2e0a1c28d355cbae2
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 2 11:51:05 2009 -0400
trident 1.3.2
diff --git a/configure.ac b/configure.ac
index 60aa953..e6c55f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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)
commit 5f638c14ebda6473dea664b3730844ae9792933e
Author: Adam Jackson <ajax@redhat.com>
Date: Thu May 28 15:22:59 2009 -0400
Remove useless loader symbol lists.
diff --git a/src/trident_driver.c b/src/trident_driver.c
index 5d0e818..8ee2b8f 100644
--- a/src/trident_driver.c
+++ b/src/trident_driver.c
@@ -488,86 +488,6 @@ tridentLCD LCD[] = {
#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 @@ tridentSetup(pointer module, pointer opts, int *errmaj, int *errmin)
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 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags)
if (!xf86LoadSubModule(pScrn, "vgahw"))
return FALSE;
- xf86LoaderReqSymLists(vgahwSymbols, NULL);
-
/*
* Allocate a vgaHWRec
*/
@@ -1191,8 +1106,6 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags)
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 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags)
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 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags)
TRIDENTFreeRec(pScrn);
return FALSE;
} else {
- xf86LoaderReqSymLists(ddcSymbols, NULL);
xf86SetDDCproperties(pScrn,xf86PrintEDID(pMon));
ddcLoaded = TRUE;
}
@@ -2431,8 +2342,6 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags)
return FALSE;
}
- xf86LoaderReqSymLists(fbSymbols, NULL);
-
if (!xf86LoadSubModule(pScrn, "i2c")) {
if (IsPciCard && UseMMIO) {
TRIDENTDisableMMIO(pScrn);
@@ -2442,15 +2351,12 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags)
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 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags)
TRIDENTFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(xaaSymbols, NULL);
}
if (pTrident->useEXA) {
@@ -2485,7 +2390,6 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags)
TRIDENTFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(exaSymbols, NULL);
}
switch (pScrn->displayWidth * pScrn->bitsPerPixel / 8) {
@@ -2517,8 +2421,6 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags)
TRIDENTFreeRec(pScrn);
return FALSE;
}
-
- xf86LoaderReqSymLists(ddcSymbols, NULL);
if (IsPciCard && UseMMIO) {
TRIDENTDisableMMIO(pScrn);
@@ -2874,7 +2776,6 @@ TRIDENTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
#endif
{
if (xf86LoadSubModule(pScrn, "int10")) {
- xf86LoaderReqSymLists(int10Symbols, NULL);
xf86DrvMsg(pScrn->scrnIndex,X_INFO,"Initializing int10\n");
pTrident->Int10 = xf86InitInt10(pTrident->pEnt->index);
}
commit d0e17d0a40c771ae484252ab6a1c093a60bddaa7
Author: Chris Ball <cjb@laptop.org>
Date: Fri Feb 27 10:58:07 2009 -0500
Revert "Build fix: set EXA_DRIVER_KNOWN_MAJOR=3"
This reverts commit b951fe81bb976704be716251a4925086f2c70013.
The EXA developers have backed out this ABI bump.
Signed-off-by: Chris Ball <cjb@laptop.org>
diff --git a/configure.ac b/configure.ac
index 95dc448..60aa953 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,9 +79,6 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
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 libraries.
# Checks for header files.
diff --git a/src/blade_accel_exa.c b/src/blade_accel_exa.c
index 3129623..80e3f23 100644
--- a/src/blade_accel_exa.c
+++ b/src/blade_accel_exa.c
@@ -251,6 +251,14 @@ static void WaitMarker(ScreenPtr pScreen, int marker)
}
}
+static Bool PrepareAccess(PixmapPtr pPix, int index)
+{
+}
+
+static void FinishAccess(PixmapPtr pPix, int index)
+{
+}
+
static void BladeInitializeAccelerator(ScrnInfoPtr pScrn)
{
TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
commit b951fe81bb976704be716251a4925086f2c70013
Author: Chris Ball <cjb@laptop.org>
Date: Wed Feb 25 13:00:12 2009 -0500
Build fix: set EXA_DRIVER_KNOWN_MAJOR=3
EXA in server HEAD requires this now. Since this driver doesn't use
{Prepare,Finish}Access or UploadToScratch, the change is safe.
Remove unused {Prepare,Finish}Access empty functions.
Signed-off-by: Chris Ball <cjb@laptop.org>
diff --git a/configure.ac b/configure.ac
index 60aa953..95dc448 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,6 +79,9 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
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 libraries.
# Checks for header files.
diff --git a/src/blade_accel_exa.c b/src/blade_accel_exa.c
index 80e3f23..3129623 100644
--- a/src/blade_accel_exa.c
+++ b/src/blade_accel_exa.c
@@ -251,14 +251,6 @@ static void WaitMarker(ScreenPtr pScreen, int marker)
}
}
-static Bool PrepareAccess(PixmapPtr pPix, int index)
-{
-}
-
-static void FinishAccess(PixmapPtr pPix, int index)
-{
-}
-
static void BladeInitializeAccelerator(ScrnInfoPtr pScrn)
{
TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
commit 4152c64a22e81a8f2e2d91507493c422aac301a3
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 30 21:04:56 2009 -0800
Add README with pointers to mailing list, bugzilla & git repos
diff --git a/README b/README
new file mode 100644
index 0000000..1a8558f
--- /dev/null
+++ b/README
@@ -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
commit 52286f1c9c543d6e8105192dc4914fa6f934bf60
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 9 16:37:18 2009 -0800
Remove xorgconfig & xorgcfg from See Also list in man page
diff --git a/man/trident.man b/man/trident.man
index 9debd9a..8d04ed0 100644
--- a/man/trident.man
+++ b/man/trident.man
@@ -133,6 +133,6 @@ Choose acceleration architecture, either "XAA" or "EXA". XAA is the old
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
Reply to: