X Strike Force SVN commit: rev 240 - in branches/4.3.0/sid/debian: . patches
Author: branden
Date: 2003-06-25 00:19:41 -0500 (Wed, 25 Jun 2003)
New Revision: 240
Modified:
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff
Log:
Fix Xv regression in trident driver, pointed out by Matt Behrens
<matt@zigg.com>.
Modified: branches/4.3.0/sid/debian/changelog
==============================================================================
--- branches/4.3.0/sid/debian/changelog 2003-06-25 00:22:20 UTC (rev 239)
+++ branches/4.3.0/sid/debian/changelog 2003-06-25 05:19:41 UTC (rev 240)
@@ -34,6 +34,9 @@
- debian/control: add Build-Depends: libxrender-dev, libxcursor-dev
[ISHIKAWA Mutsumi]
+ * Fix Xv regression in trident driver.
+ - #patch 000_stolen_from_HEAD: updated
+
* new SiS driver, from XFree86 HEAD:
- patch #000_stolen_from_HEAD_sis_driver: new. (closes: #183619, #186237,
#196912)
Modified: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff
==============================================================================
--- branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff 2003-06-25 00:22:20 UTC (rev 239)
+++ branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff 2003-06-25 05:19:41 UTC (rev 240)
@@ -3,6 +3,7 @@
* More strict checking of replies (mainly wrt length) in core X11 handling.
* Fix segfaults in rendition and trident drivers.
* Drivers shouldn't have to care about recolouring ARGB cursors.
+ * Fix Xv regression in trident driver.
diff -urN xc.orig/config/imake/imake.c xc/config/imake/imake.c
--- xc.orig/config/imake/imake.c 2002-12-17 09:48:27.000000000 +1100
@@ -294,6 +295,27 @@
if (pTrident->IsCyber && !pTrident->MMIOonly)
pReg->tridentRegs3x4[DRAMControl] |= 0x20;
+diff -u -p -r1.35 -r1.36
+--- xc/programs/Xserver/hw/xfree86/drivers/trident/trident_video.c 2003/06/01 23:02:09 1.35
++++ xc/programs/Xserver/hw/xfree86/drivers/trident/trident_video.c 2003/06/19 11:01:54 1.36
+@@ -21,7 +21,7 @@
+ *
+ * Author: Alan Hourihane, alanh@fairlite.demon.co.uk
+ */
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_video.c,v 1.34 2003/06/01 22:21:01 alanh Exp $ */
++/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_video.c,v 1.35 2003/06/01 23:02:09 alanh Exp $ */
+
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+@@ -773,7 +773,7 @@
+ } else {
+ OUTW(0x3C4, 0x0097); /* 1x line buffers */
+ }
+- OUTW(vgaIOBase + 4, 0x8097);
++ OUTW(vgaIOBase + 4, 0x0097);
+ OUTW(vgaIOBase + 4, 0x00BA);
+ OUTW(vgaIOBase + 4, 0x00BB);
+ OUTW(vgaIOBase + 4, 0xFFBC);
diff -urN xc.orig/programs/Xserver/hw/xfree86/ramdac/xf86HWCurs.c xc/programs/Xserver/hw/xfree86/ramdac/xf86HWCurs.c
--- xc.orig/programs/Xserver/hw/xfree86/ramdac/xf86HWCurs.c 2003-02-14 07:28:41.000000000 +1100
+++ xc/programs/Xserver/hw/xfree86/ramdac/xf86HWCurs.c 2003-04-09 01:58:14.000000000 +1000
Reply to: