xserver-xorg-video-trident: Changes to 'upstream-experimental'
.gitignore | 70 +++++++++++++++++++++--
COPYING | 67 +++++++++++++++++++---
ChangeLog | 155 ---------------------------------------------------
Makefile.am | 12 +++
README | 20 ++++++
configure.ac | 26 ++++++--
man/.cvsignore | 2
man/Makefile.am | 41 ++++++-------
man/trident.man | 2
src/.cvsignore | 6 -
src/Makefile.am | 1
src/trident.h | 13 +++-
src/trident_dac.c | 3
src/trident_driver.c | 143 ++++++++++-------------------------------------
src/trident_shadow.c | 1
src/trident_video.c | 1
src/tridenthelper.c | 1
src/tvga_dac.c | 3
18 files changed, 242 insertions(+), 325 deletions(-)
New commits:
commit b5d17329ae1746bc95ac211c1325df86982e0eb1
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Jul 5 14:32:39 2010 +1000
trident 1.3.4
diff --git a/configure.ac b/configure.ac
index ebff147..be54427 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-trident],
- 1.3.3,
+ 1.3.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-trident)
commit ea2f02a84ad5a51a39c0ae55fa5aa785360d3830
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Jun 13 12:34:21 2010 -0400
COPYING: replace stub file with actual Copyright notices.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/COPYING b/COPYING
index 7f33cbf..42cdf3b 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,63 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright 1992-2003 by Alan Hourihane, North Wales, UK.
-Please submit updated COPYING files to the Xorg bugzilla:
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Alan Hourihane not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission. Alan Hourihane makes no representations
+about the suitability of this software for any purpose. It is provided
+"as is" without express or implied warranty.
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
+Copyright 1997-2003 by Alan Hourihane, North Wales, UK.
+Copyright 2006 by Alan Hourihane, North Wales, UK.
+Copyright (c) 2006, Jesse Barnes <jbarnes@virtuousgeek.org>
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of the authors not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission. The authors make no representations
+about the suitability of this software for any purpose. It is provided
+"as is" without express or implied warranty.
+
+THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+Copyright 2007 George Sapountzis
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
-http://lists.freedesktop.org/mailman/listinfo/xorg
commit cb7949bf5a4e99755677ce5df09f2e977a47da71
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 15 15:05:31 2010 -0800
Update Sun license notices to current X.Org standard form
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/man/Makefile.am b/man/Makefile.am
index f0eb29b..8f2454b 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,27 +1,24 @@
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation.
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-# OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the copyright holders shall
-# not be used in advertising or otherwise to promote the sale, use or
-# other dealings in this Software without prior written authorization
-# from the copyright holders.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
#
drivermandir = $(DRIVER_MAN_DIR)
commit c5ec01e6786280717675d3841d85337645b15753
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Dec 15 22:01:02 2009 -0500
configure.ac: remove unused sdkdir=$(pkg-config...) statement
The sdkdir variable isn't use, so remove the statement.
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 575d92b..ebff147 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,7 +66,6 @@ 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"
CFLAGS="$XORG_CFLAGS"
commit 1331623dbee4fbfa36188a4460a95bed4128f11e
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Dec 30 13:08:51 2009 -0500
Make banking support properly conditional on ISA support
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/trident.h b/src/trident.h
index 1142b50..c15d39c 100644
--- a/src/trident.h
+++ b/src/trident.h
@@ -46,6 +46,13 @@
#include "xf86Pci.h"
#include "vbe.h"
+/* Banked framebuffer only supported on ISA */
+#ifdef HAVE_ISA
+#define LINEAR() (pTrident->Linear)
+#else
+#define LINEAR() (1)
+#endif
+
#define PCI_CHIP_2200 0x2200
typedef struct {
diff --git a/src/trident_dac.c b/src/trident_dac.c
index cd7da80..a46f22b 100644
--- a/src/trident_dac.c
+++ b/src/trident_dac.c
@@ -640,7 +640,7 @@ TridentInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
pReg->tridentRegs3C4[Protection] = 0x92;
pReg->tridentRegs3x4[LinearAddReg] = 0;
- if (pTrident->Linear) {
+ if (LINEAR()) {
/* This is used for VLB, when we support it again in 4.0 */
if (pTrident->Chipset < CYBER9385)
pReg->tridentRegs3x4[LinearAddReg] |=
diff --git a/src/trident_driver.c b/src/trident_driver.c
index addb1af..31cbb83 100644
--- a/src/trident_driver.c
+++ b/src/trident_driver.c
@@ -35,7 +35,9 @@
#include "fb.h"
+#ifdef HAVE_ISA
#include "mibank.h"
+#endif
#include "micmap.h"
#include "xf86.h"
#include "xf86_OSproc.h"
@@ -72,7 +74,6 @@
#include <X11/extensions/dpms.h>
#endif
-
#include "xf86xv.h"
static const OptionInfoRec * TRIDENTAvailableOptions(int chipid, int busid);
@@ -1353,7 +1354,7 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags)
pTrident->OverrideBskew);
}
if (xf86ReturnOptValBool(pTrident->Options, OPTION_SHADOW_FB, FALSE)) {
- if (!pTrident->Linear)
+ if (!LINEAR())
xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Ignoring Option SHADOW_FB"
" in non-Linear Mode\n");
else {
@@ -1365,7 +1366,7 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags)
}
pTrident->Rotate = 0;
if ((s = xf86GetOptValString(pTrident->Options, OPTION_ROTATE))) {
- if (!pTrident->Linear)
+ if (!LINEAR())
xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Ignoring Option ROTATE "
"in non-Linear Mode\n");
else {
@@ -1415,7 +1416,7 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags)
/* FIXME ACCELERATION */
if (!UseMMIO) pTrident->NoAccel = TRUE;
- if (pTrident->Linear) {
+ if (LINEAR()) {
if (pTrident->pEnt->device->MemBase != 0) {
/*
* XXX Should check that the config file value matches one of the
@@ -2498,7 +2499,7 @@ TRIDENTMapMem(ScrnInfoPtr pScrn)
if (pTrident->IOBase == NULL)
return FALSE;
- if (pTrident->Linear) {
+ if (LINEAR()) {
if (pTrident->FbMapSize != 0) {
#ifndef XSERVER_LIBPCIACCESS
pTrident->FbBase = xf86MapPciMem(pScrn->scrnIndex,
@@ -2559,7 +2560,7 @@ TRIDENTUnmapMem(ScrnInfoPtr pScrn)
#endif
pTrident->IOBase = NULL;
- if (pTrident->Linear) {
+ if (LINEAR()) {
if (pTrident->FbMapSize != 0) {
#ifdef XSERVER_LIBPCIACCESS
pci_device_unmap_range(pTrident->PciInfo, (pointer)pTrident->FbBase, pTrident->FbMapSize);
@@ -2931,7 +2932,8 @@ TRIDENTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
if (!pTrident->ShadowFB)
TRIDENTDGAInit(pScreen);
- if (!pTrident->Linear) {
+#ifdef HAVE_ISA
+ if (!LINEAR()) {
miBankInfoPtr pBankInfo;
/* Setup the vga banking variables */
@@ -2965,6 +2967,7 @@ TRIDENTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
return FALSE;
}
}
+#endif
{
BoxRec AvailFBArea;
diff --git a/src/tvga_dac.c b/src/tvga_dac.c
index 422005d..7f2e89a 100644
--- a/src/tvga_dac.c
+++ b/src/tvga_dac.c
@@ -110,7 +110,7 @@ TVGAInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
pReg->tridentRegs3C4[NewMode1] = 0x80;
- if (pTrident->Linear)
+ if (LINEAR())
pReg->tridentRegs3x4[LinearAddReg] = ((pTrident->FbAddress >> 24) << 6)|
((pTrident->FbAddress >> 20) & 0x0F)|
0x20;
commit d6f5105ff4bab91a2af4cf5655b88ff27cba74bd
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.
diff --git a/Makefile.am b/Makefile.am
index d451f3e..4c278ba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,7 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
SUBDIRS = src man
+MAINTAINERCLEANFILES = ChangeLog INSTALL
.PHONY: ChangeLog INSTALL
commit 3809fea7739b8639d855d790686c2b1eb1b91898
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
diff --git a/Makefile.am b/Makefile.am
index 882733f..d451f3e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,6 @@
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
.PHONY: ChangeLog INSTALL
commit 781094dd862b209022bb2f8cdf394e3479ab28c6
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.
diff --git a/Makefile.am b/Makefile.am
index 8b7c3c7..882733f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,9 +21,12 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
diff --git a/configure.ac b/configure.ac
index 24951c3..575d92b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ AC_CONFIG_SRCDIR([Makefile.am])
AM_CONFIG_HEADER([config.h])
AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 11775de5025c32b65551497cb7fbb7040be9c314
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
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 4809cab..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,155 +0,0 @@
-2006-04-07 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- * src/trident_driver.c:
- Bump to 1.2.1 for Xv changes.
-
-2006-04-07 Aaron Plattner <aplattner@nvidia.com>
-
- * src/trident_video.c: (TRIDENTPutImage):
- Add a DrawablePtr argument to the XV functions to pave the way for
- redirected video.
-
-2006-04-07 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- * src/blade_accel.c:
- * src/blade_accel_exa.c:
- * src/image_accel.c:
- * src/trident.h:
- * src/trident_accel.c:
- * src/trident_bank.c:
- * src/trident_dac.c:
- * src/trident_dga.c:
- * src/trident_driver.c:
- * src/trident_i2c.c:
- * src/trident_shadow.c:
- * src/trident_tv.c:
- * src/trident_video.c:
- * src/tridenthelper.c:
- * src/tridentramdac.c:
- * src/tvga_dac.c:
- * src/xp4_accel.c:
- * src/xp4_accel_exa.c:
- * src/xp_accel.c:
- Unlibcwrap. Bump server version requirement. Bump to 1.2.0.
-
-2006-04-06 Adam Jackson <ajax@freedesktop.org>
-
- * src/trident.h:
- Coverity #500: Size the tridentRegsClock array properly.
-
-2006-03-14 Alan Hourihane <alanh@fairlite.demon.co.uk>
-
- * src/blade_accel_exa.c: (BladeExaInit):
- * src/xp4_accel_exa.c: (XP4ExaInit):
- Change virtualX to displayWidth (caught by Eric Anholt)
-
-2006-03-13 Alan Hourihane <alanh@fairlite.demon.co.uk>
-
- * src/blade_accel_exa.c: (BladeExaInit):
- * src/trident_driver.c: (TRIDENTPreInit):
- * src/xp4_accel_exa.c: (XP4ExaInit):
- EXA fixups for version 2
- Add missing break statement which confused XP4 & XP5.
- Force 128MB XP5 to 64MB for now.
-
-2006-02-21 Alan Hourihane <alanh@fairlite.demon.co.uk>
-
- * man/trident.man:
- * src/Makefile.am:
- * src/blade_accel.c: (BladeXaaInit):
- * src/blade_accel_exa.c: (GetCopyROP), (GetDepth), (PrepareSolid),
- (Solid), (DoneSolid), (PrepareCopy), (Copy), (DoneCopy),
- (CheckComposite), (PrepareComposite), (Composite), (DoneComposite),
- (UploadToScreen), (DownloadFromScreen), (MarkSync),
- (BladeDisableClipping), (WaitMarker), (PrepareAccess),
- (FinishAccess), (BladeSetClippingRectangle),
- (BladeInitializeAccelerator), (BladeExaInit):
- * src/trident.h:
- * src/trident_driver.c: (tridentSetup), (TRIDENTProbe),
- (TRIDENTPreInit), (TRIDENTMapMem), (TRIDENTScreenInit),
- (TRIDENTLeaveVT), (TRIDENTCloseScreen):
- * src/trident_regs.h:
- * src/xp4_accel.c: (XP4InitializeAccelerator), (XP4XaaInit),
- (XP4Sync), (XP4SetupForScreenToScreenCopy),
- (XP4SubsequentScreenToScreenCopy), (XP4SetupForSolidLine),
- (XP4SubsequentSolidBresenhamLine), (XP4SubsequentSolidHorVertLine),
- (XP4SetupForDashedLine), (XP4SubsequentDashedBresenhamLine),
- (XP4SetupForFillRectSolid), (XP4SubsequentFillRectSolid),
- (MoveDWORDS), (MoveDWORDS_FixedBase),
- (XP4SetupForMono8x8PatternFill),
- (XP4SubsequentMono8x8PatternFillRect),
- (XP4SetupForCPUToScreenColorExpandFill),
- (XP4SubsequentCPUToScreenColorExpandFill):
- * src/xp4_accel_exa.c: (GetCopyROP), (GetPatternROP),
- (XP4WaitMarker), (XP4Done), (XP4PrepareSolid), (XP4Solid),
- (XP4PrepareCopy), (XP4Copy), (XP4ExaInit):
- Add XAA & EXA Acceleration for XP4 & XP5 Chipsets
- Add EXA Acceleration for Blade chipsets (Jesse Barnes)
-
-2006-02-01 Alan Hourihane <alanh@fairlite.demon.co.uk>
-
- * src/trident_dac.c: (TridentInit), (TridentHWCursorInit):
- * src/trident_driver.c: (TRIDENTPreInit), (TRIDENTModeInit),
- (TRIDENTCloseScreen), (TRIDENTLcdDisplaySize):
- * src/trident_video.c: (tridentFixFrame):
- * src/tridenthelper.c: (TridentFindClock):
- Commit patch from https://bugs.freedesktop.org/show_bug.cgi?id=2785
- i.e. detect 1400x1050 panels from DDC information and a few other
- fixes for BladeXP chipsets - notably the Toshiba Tecra 8200.
-
-2006-01-27 Alan Hourihane <alanh@fairlite.demon.co.uk>
-
- * configure.ac:
- * src/trident.h:
- * src/trident_dac.c: (TridentInit), (TridentRestore),
- (TridentSave), (TridentHWCursorInit):
- * src/trident_driver.c: (TRIDENTPreInit), (TRIDENTModeInit):
- Add XGI (aka Trident) Volari XP5 support
-
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version for X11R7 release.
-
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for final X11R7 release candidate.
-
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
-
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC3 release.
-
-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Remove extraneous AC_MSG_RESULT.
-
-2005-11-29 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- Only build dlloader modules by default.
-
-2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Add check for DGA extension to fix issues when building with
- separate build roots.
-
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC2 release.
-
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update pkgcheck dependencies to work with separate build roots.
diff --git a/Makefile.am b/Makefile.am
index 7052905..8b7c3c7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,3 +20,10 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index a53fd69..24951c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,6 +34,12 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
+
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
@@ -94,9 +100,6 @@ AC_SUBST([moduledir])
DRIVER_NAME=trident
AC_SUBST([DRIVER_NAME])
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-
AC_OUTPUT([
Makefile
src/Makefile
commit 7401cbd387631e2678bbdfdfcc4e30e5a0ecd4c8
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.
diff --git a/.gitignore b/.gitignore
index 2df4a8d..eba3b2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1,78 @@
-Makefile
-Makefile.in
-*.la
-*.lo
+#
+# X.Org module default exclusion patterns
+# The next section if for module specific patterns
+#
+# Do not edit the following section
+# GNU Build System (Autotools)
aclocal.m4
-autom4te.cache
+autom4te.cache/
+autoscan.log
+ChangeLog
+compile
config.guess
config.h
config.h.in
config.log
+config-ml.in
+config.py
config.status
+config.status.lineno
config.sub
configure
+configure.scan
depcomp
+.deps/
+INSTALL
install-sh
+.libs/
libtool
+libtool.m4
ltmain.sh
+lt~obsolete.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
+Makefile
+Makefile.in
+mdate-sh
missing
-stamp-h1
+mkinstalldirs
+*.pc
+py-compile
+stamp-h?
+symlink-tree
+texinfo.tex
+ylwrap
+
+# Do not edit the following section
+# Edit Compile Debug Document Distribute
*~
+*.[0-9]
+*.[0-9]x
+*.bak
+*.bin
+core
+*.dll
+*.exe
+*-ISO*.bdf
+*-JIS*.bdf
+*-KOI8*.bdf
+*.kld
+*.ko
+*.ko.cmd
+*.lai
+*.l[oa]
+*.[oa]
+*.obj
+*.patch
+*.so
+*.pcf.gz
+*.pdb
+*.tar.bz2
+*.tar.gz
+#
+# Add & Override patterns for xf86-video-trident
+#
+# Edit the following section as needed
+# For example, !report.pc overrides *.pc. See 'man gitignore'
+#
commit f688b70c64ceed3704db2510a17561524a3b6ef8
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Sep 7 11:12:13 2009 -0400
xf86-video-trident: Remove unused .cvsignore file #23776
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/man/.cvsignore b/man/.cvsignore
deleted file mode 100644
index 282522d..0000000
--- a/man/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/src/.cvsignore b/src/.cvsignore
deleted file mode 100644
index 9730646..0000000
--- a/src/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
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
Reply to: