xserver-xorg-video-trident: Changes to 'upstream-unstable'
configure.ac | 2 +-
src/trident_driver.c | 6 +++---
src/trident_video.c | 11 +++++++++--
3 files changed, 13 insertions(+), 6 deletions(-)
New commits:
commit 707a7c779c6859761c1b895b397239a36abef4c6
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Sun Feb 10 21:12:33 2008 +0000
bump to 1.2.4
diff --git a/configure.ac b/configure.ac
index c3e3b39..815670e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-trident],
- 1.2.3,
+ 1.2.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-trident)
commit 6e204c6f73ccf262cb9f1eaa68af9d4c86321bd8
Author: Kostas Georgiou <hannibal@astral.lodz.pl>
Date: Sun Feb 10 21:11:01 2008 +0000
Don't set VID_DOUBLE_LINEBUFFER_FOR_WIDE_SRC for XP4
diff --git a/src/trident_video.c b/src/trident_video.c
index a8eb890..8607d93 100644
--- a/src/trident_video.c
+++ b/src/trident_video.c
@@ -113,7 +113,7 @@ void TRIDENTInitVideo(ScreenPtr pScreen)
if (pTrident->Chipset == CYBER9397DVD ||
pTrident->Chipset == CYBER9525DVD ||
- pTrident->Chipset >= BLADE3D)
+ (pTrident->Chipset >= BLADE3D && pTrident->Chipset < CYBERBLADEXP4))
pTrident->videoFlags |= VID_DOUBLE_LINEBUFFER_FOR_WIDE_SRC;
newAdaptor = TRIDENTSetupImageVideo(pScreen);
commit 8e8eafa82c66873fcc0f159b56fd638c03304a6d
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Sun Jan 6 20:26:13 2008 +0000
Fix typo
diff --git a/src/trident_video.c b/src/trident_video.c
index 9b1eca8..a8eb890 100644
--- a/src/trident_video.c
+++ b/src/trident_video.c
@@ -1315,7 +1315,7 @@ tridentFixFrame(ScrnInfoPtr pScrn, int *fixFrame)
break;
case CYBERBLADEXP4:
pTrident->hsync -= 24;
- pTrident->hsync_rskew = -=1;
+ pTrident->hsync_rskew = -1;
break;
case CYBER9397:
pTrident->hsync -= 1;
commit 61a0dcfa57702fbe4d2a1832a014ce9bc5ddfc89
Author: Jan Darmochwal <jdarmochwal@gmx.de>
Date: Sun Jan 6 20:23:58 2008 +0000
Turn on colour key for XP4
diff --git a/src/trident_video.c b/src/trident_video.c
index b62242f..9b1eca8 100644
--- a/src/trident_video.c
+++ b/src/trident_video.c
@@ -261,6 +261,9 @@ void TRIDENTResetVideo(ScrnInfoPtr pScrn)
OUTW(0x3C4, 0x007A);
OUTW(0x3C4, 0x007D);
}
+ if (pTrident->Chipset == CYBERBLADEXP4) {
+ OUTW(0x3CE, 0x0462);
+ }
switch (pScrn->depth) {
case 8:
VIDEOOUT(pPriv->colorKey, pTrident->keyOffset);
@@ -1310,12 +1313,16 @@ tridentFixFrame(ScrnInfoPtr pScrn, int *fixFrame)
case CYBERBLADEE4:
pTrident->hsync -= 8;
break;
+ case CYBERBLADEXP4:
+ pTrident->hsync -= 24;
+ pTrident->hsync_rskew = -=1;
+ break;
case CYBER9397:
pTrident->hsync -= 1;
pTrident->vsync -= 0;
pTrident->vsync_bskew = 0;
break;
- case CYBER9397DVD:
+ case CYBER9397DVD:
pTrident->hsync_rskew = -1;
pTrident->vsync_bskew = -1;
break;
commit 1a6bbe36a7f91d90e39251ba7759f3db5b6d4d24
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Aug 7 11:53:13 2007 +0200
TRIDENT_*_VERSION using PACKAGE_VERSION_*
diff --git a/src/trident_driver.c b/src/trident_driver.c
index a5b11df..df2260f 100644
--- a/src/trident_driver.c
+++ b/src/trident_driver.c
@@ -115,9 +115,9 @@ static int pix24bpp = 0;
#define TRIDENT_VERSION 4000
#define TRIDENT_NAME "TRIDENT"
#define TRIDENT_DRIVER_NAME "trident"
-#define TRIDENT_MAJOR_VERSION 1
-#define TRIDENT_MINOR_VERSION 2
-#define TRIDENT_PATCHLEVEL 3
+#define TRIDENT_MAJOR_VERSION PACKAGE_VERSION_MAJOR
+#define TRIDENT_MINOR_VERSION PACKAGE_VERSION_MINOR
+#define TRIDENT_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL
/*
* This contains the functions needed by the server after loading the driver
Reply to: