xserver-xorg-video-tseng: Changes to 'upstream-unstable'
README | 20 +++++++++++++
configure.ac | 2 -
man/tseng.man | 2 -
src/tseng_driver.c | 80 +++++------------------------------------------------
4 files changed, 30 insertions(+), 74 deletions(-)
New commits:
commit 5734845c91179a1138d75aaad48102cb077a2b12
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Sep 7 14:52:01 2009 +1000
bump version to 1.2.3
diff --git a/configure.ac b/configure.ac
index 3707413..7a0da70 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-tseng],
- 1.2.2,
+ 1.2.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-tseng)
commit d095c1d51b1a895471ce0b1970ae21ee6499ae51
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 15:22:41 2009 +1000
tseng: change to using ABI version check
diff --git a/src/tseng_driver.c b/src/tseng_driver.c
index 1b61da8..445c17e 100644
--- a/src/tseng_driver.c
+++ b/src/tseng_driver.c
@@ -42,7 +42,7 @@
#include "fb.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86RAC.h"
#include "xf86Resources.h"
#endif
commit 17ebee6804a99af32747b801c5b979ba5248a9d8
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 13:32:40 2009 +1000
tseng: update for resources/RAC API removal
diff --git a/src/tseng_driver.c b/src/tseng_driver.c
index efa19c8..1b61da8 100644
--- a/src/tseng_driver.c
+++ b/src/tseng_driver.c
@@ -42,8 +42,10 @@
#include "fb.h"
+#ifndef XSERVER_LIBPCIACCESS
#include "xf86RAC.h"
#include "xf86Resources.h"
+#endif
#include "xf86int10.h"
#include "xf86xv.h"
@@ -889,10 +891,12 @@ TsengGetFbAddress(ScrnInfoPtr pScrn)
pTseng->FbAddress = PCI_REGION_BASE(pTseng->PciInfo, 0, REGION_MEM);
+#ifndef XSERVER_LIBPCIACCESS
if (xf86RegisterResources(pTseng->pEnt->index,NULL,ResNone)) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Cannot register FB memory.\n");
return FALSE;
}
+#endif
/* The W32 linear map address space is always 4Mb (mainly because the
* memory-mapped registers are located near the top of the 4MB area).
@@ -1089,13 +1093,14 @@ TsengPreInit(ScrnInfoPtr pScrn, int flags)
else
VGAHWPTR(pScrn)->MapSize = 0x10000;
+#ifndef XSERVER_LIBPCIACCESS
/*
* XXX At least part of this range does appear to be disabled,
* but to play safe, it is marked as "unused" for now.
* Changed this to "disable". Otherwise it might interfere with DGA.
*/
xf86SetOperatingState(resVgaMem, pTseng->pEnt->index, ResDisableOpr);
-
+#endif
/* hibit processing (TsengProcessOptions() must have been called first) */
pTseng->save_divide = 0x40; /* default */
if (pTseng->ChipType == ET4000) {
@@ -1466,9 +1471,10 @@ TsengScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
if (pScrn->depth == 4 || pScrn->depth == 8) { /* fb and xf4bpp */
vgaHWHandleColormaps(pScreen);
}
+#ifndef XSERVER_LIBPCIACCESS
pScrn->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
pScrn->racMemFlags = pScrn->racIoFlags;
-
+#endif
/* Wrap the current CloseScreen and SaveScreen functions */
pScreen->SaveScreen = TsengSaveScreen;
commit 25548be8814796925625b11f390dca29b1e47358
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 2 11:53:03 2009 -0400
tseng 1.2.2
diff --git a/configure.ac b/configure.ac
index 2fd20f7..3707413 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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)
commit 1ce0bf811255b1faa00aa279e8972a1a027849ab
Author: Adam Jackson <ajax@redhat.com>
Date: Thu May 28 15:23:41 2009 -0400
Remove useless loader symbol lists.
diff --git a/src/tseng_driver.c b/src/tseng_driver.c
index 46fc3ae..efa19c8 100644
--- a/src/tseng_driver.c
+++ b/src/tseng_driver.c
@@ -180,58 +180,6 @@ static const OptionInfoRec TsengOptions[] =
{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 @@ tsengSetup(pointer module, pointer opts, int *errmaj, int *errmin)
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 @@ TsengPreInit(ScrnInfoPtr pScrn, int flags)
#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 @@ TsengPreInit(ScrnInfoPtr pScrn, int flags)
if (!xf86LoadSubModule(pScrn, "vgahw"))
return FALSE;
- xf86LoaderReqSymLists(vgaHWSymbols, NULL);
/*
* Allocate a vgaHWRec
*/
@@ -1240,21 +1175,18 @@ TsengPreInit(ScrnInfoPtr pScrn, int flags)
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 @@ TsengPreInit(ScrnInfoPtr pScrn, int flags)
TsengFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(xaaSymbols, NULL);
}
/* Load ramdac if needed */
if (pTseng->HWCursor) {
@@ -1272,7 +1203,6 @@ TsengPreInit(ScrnInfoPtr pScrn, int flags)
TsengFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
/* TsengLock(pScrn); */
commit 7addf8709202634ac45b4c51d910e2798054271c
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 30 21:05:06 2009 -0800
Add README with pointers to mailing list, bugzilla & git repos
diff --git a/README b/README
new file mode 100644
index 0000000..0936ded
--- /dev/null
+++ b/README
@@ -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
commit 9d4aea1211de81fb27069d087bd4393d27355239
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 9 16:37:31 2009 -0800
Remove xorgconfig & xorgcfg from See Also list in man page
diff --git a/man/tseng.man b/man/tseng.man
index fad7528..403782f 100644
--- a/man/tseng.man
+++ b/man/tseng.man
@@ -25,6 +25,6 @@ Please refer to __xconfigfile__(__filemansuffix__) for general configuration
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: ...
Reply to: