Update to xf86-video-trident 1.3.4

5 files changed, 27 insertions, 11 deletions

diff --git a/driver/xf86-video-trident/src/Makefile.in b/driver/xf86-video-trident/src/Makefile.in
index e51619910..f9ba40779 100644
--- a/driver/xf86-video-trident/src/Makefile.in
+++ b/driver/xf86-video-trident/src/Makefile.in
@@ -104,6 +104,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 APP_MAN_DIR = @APP_MAN_DIR@
 APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AR = @AR@
@@ -114,8 +115,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
@@ -140,6 +143,7 @@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
 HAVE_XEXTPROTO_71_FALSE = @HAVE_XEXTPROTO_71_FALSE@
 HAVE_XEXTPROTO_71_TRUE = @HAVE_XEXTPROTO_71_TRUE@
+INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -156,6 +160,7 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MAN_SUBSTS = @MAN_SUBSTS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 NMEDIT = @NMEDIT@
@@ -180,6 +185,7 @@ XEXT_CFLAGS = @XEXT_CFLAGS@
 XEXT_LIBS = @XEXT_LIBS@
 XORG_CFLAGS = @XORG_CFLAGS@
 XORG_LIBS = @XORG_LIBS@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
 XSERVER_LIBPCIACCESS_FALSE = @XSERVER_LIBPCIACCESS_FALSE@
 XSERVER_LIBPCIACCESS_TRUE = @XSERVER_LIBPCIACCESS_TRUE@
 ac_ct_CC = @ac_ct_CC@
@@ -276,9 +282,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/Makefile
+	  $(AUTOMAKE) --foreign  src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/driver/xf86-video-trident/src/trident.h b/driver/xf86-video-trident/src/trident.h
index 1142b50a8..c15d39c30 100644
--- a/driver/xf86-video-trident/src/trident.h
+++ b/driver/xf86-video-trident/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/driver/xf86-video-trident/src/trident_dac.c b/driver/xf86-video-trident/src/trident_dac.c
index cd7da8072..a46f22b60 100644
--- a/driver/xf86-video-trident/src/trident_dac.c
+++ b/driver/xf86-video-trident/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/driver/xf86-video-trident/src/trident_driver.c b/driver/xf86-video-trident/src/trident_driver.c
index addb1af1a..31cbb83ce 100644
--- a/driver/xf86-video-trident/src/trident_driver.c
+++ b/driver/xf86-video-trident/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/driver/xf86-video-trident/src/tvga_dac.c b/driver/xf86-video-trident/src/tvga_dac.c
index 422005df8..7f2e89a64 100644
--- a/driver/xf86-video-trident/src/tvga_dac.c
+++ b/driver/xf86-video-trident/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;