X Strike Force XFree86 SVN commit: rev 741 - in branches/4.3.0/sid/debian: . patches
Author: branden
Date: 2003-11-01 17:00:16 -0500 (Sat, 01 Nov 2003)
New Revision: 741
Removed:
branches/4.3.0/sid/debian/patches/453_ia64_fix_drm_deadlock.diff
Modified:
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/patches/000_post430.diff
Log:
Grab latest fixes to upstream CVS xf-4_3-branch.
- debian/patches/000_post430.diff:
(xc/programs/Xserver/hw/xfree86/os-support/xf86drm.h):
1009. Fix DRM_CAS on ia64 as used by the DRI (Bugzilla #778, John
Dennis). (Alan Hourihane)
- debian/patches/453_ia64_fix_radeon_dri_deadlock.diff: deleted;
superseded by upstream patch
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2003-11-01 21:54:59 UTC (rev 740)
+++ branches/4.3.0/sid/debian/changelog 2003-11-01 22:00:16 UTC (rev 741)
@@ -72,8 +72,16 @@
- debian/xlibmesa-dri-dbg.install.powerpc
- debian/xlibmesa-dri-dbg.install.sparc
- -- Branden Robinson <branden@debian.org> Fri, 31 Oct 2003 00:54:45 -0500
+ * Grab latest fixes to upstream CVS xf-4_3-branch.
+ - debian/patches/000_post430.diff:
+ (xc/programs/Xserver/hw/xfree86/os-support/xf86drm.h):
+ 1009. Fix DRM_CAS on ia64 as used by the DRI (Bugzilla #778, John
+ Dennis). (Alan Hourihane)
+ - debian/patches/453_ia64_fix_radeon_dri_deadlock.diff: deleted;
+ superseded by upstream patch
+ -- Branden Robinson <branden@debian.org> Sat, 1 Nov 2003 16:56:13 -0500
+
xfree86 (4.3.0-0pre1v4) experimental; urgency=low
* Add missing symbolic links for libXTrap. [ISHIKAWA Mutsumi]
@@ -2437,14 +2445,14 @@
(Marc La France)
- Modify Type1 font RAM allocation heuristics to allow for larger fonts.
(#A.1121, Melchior Franz)
- + Fix a typo in the s3 driver which prevented virtual display sizes.
+ + Fix a typo in the s3 driver which prevented virtual display sizes.
(#A.965, Stef Voltz).
+ Fix input size of character strings used in lib/X11/lcGetConv.c
(#A.828, Yong-Jhen Hong).
+ Fix a memory leak when calling _XCloseLC and removing the loadable
locales (#A.855 Mark Robinson).
+ Fix wrong check in Xaw when rebuilding the line table. If the width
- of a line becomes smaller, it should clear to eol. (Paulo Cesar Pereira
+ of a line becomes smaller, it should clear to eol. (Paulo Cesar Pereira
de Andrade)
+ In the X server, permit XDM-AUTHENTICATION-1 without also requiring
XDMCP support. (Keith Packard)
Modified: branches/4.3.0/sid/debian/patches/000_post430.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/000_post430.diff 2003-11-01 21:54:59 UTC (rev 740)
+++ branches/4.3.0/sid/debian/patches/000_post430.diff 2003-11-01 22:00:16 UTC (rev 741)
@@ -291,6 +291,10 @@
i830_memory.c,i830_video.c}):
Fix some i830+ VT switch/exit crashes (David Dawes, Egbert Eich).
+(xc/programs/Xserver/hw/xfree86/os-support/xf86drm.h):
+ 1009. Fix DRM_CAS on ia64 as used by the DRI (Bugzilla #778, John
+ Dennis). (Alan Hourihane)
+
Index: xc/config/cf/NetBSD.cf
===================================================================
RCS file: /cvs/xc/config/cf/NetBSD.cf,v
@@ -2456,12 +2460,13 @@
===================================================================
RCS file: /cvs/xc/programs/Xserver/hw/xfree86/CHANGELOG,v
retrieving revision 3.2588
-retrieving revision 3.2588.2.31
-diff -u -r3.2588 -r3.2588.2.31
+retrieving revision 3.2588.2.32
+diff -u -r3.2588 -r3.2588.2.32
--- xc/programs/Xserver/hw/xfree86/CHANGELOG 27 Feb 2003 04:56:44 -0000 3.2588
-+++ xc/programs/Xserver/hw/xfree86/CHANGELOG 21 Oct 2003 02:22:31 -0000 3.2588.2.31
-@@ -1,3 +1,103 @@
++++ xc/programs/Xserver/hw/xfree86/CHANGELOG 29 Oct 2003 11:01:56 -0000 3.2588.2.32
+@@ -1,3 +1,104 @@
+XFree86 4.3.0.2 (xx September 2003)
++1009. Fix DRM_CAS on ia64 as used by the DRI (Bugzilla #778, John Dennis).
+1008. Fix some i830+ VT switch/exit crashes (David Dawes, Egbert Eich).
+1007. Fixed definititon of UseInstalledOnCrossCompile so that it never is
+ undefined (Harlod L. Hunt II).
@@ -2564,12 +2569,12 @@
XFree86 4.3.0 (27 February 2003)
964. Add an imake option to allow the glibc21-style setjmp() behaviour
to be forced when auto-detecting it fails (this is needed for RH 7.0).
-@@ -16536,4 +16636,9 @@
+@@ -16536,4 +16637,9 @@
XFree86 3.0 (26 April 1994)
-$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.2588 2003/02/27 04:56:44 dawes Exp $
-+$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.2588.2.31 2003/10/21 02:22:31 dawes Exp $
++$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.2588.2.32 2003/10/29 11:01:56 alanh Exp $
+
+
+
@@ -3035,12 +3040,12 @@
@@ -879,7 +879,7 @@
# define RADEON_P2PLL_REF_DIV_MASK 0x03ff
# define RADEON_P2PLL_ATOMIC_UPDATE_R (1 << 15) /* same as _W */
- # define RADEON_P2PLL_ATOMIC_UPDATE_W (1 << 15) /* same as _R */
+ # define RADEON_P2PLL_ATOMIC_UPDATE_W (1 << 15) /* same as _R */
-# define R300_PPLL_REF_DIV_ACC_MASK (0x3ff < 18)
+# define R300_PPLL_REF_DIV_ACC_MASK (0x3ff << 18)
# define R300_PPLL_REF_DIV_ACC_SHIFT 18
#define RADEON_PALETTE_DATA 0x00b4
- #define RADEON_PALETTE_30_DATA 0x00b8
+ #define RADEON_PALETTE_30_DATA 0x00b8
Index: xc/programs/Xserver/hw/xfree86/drivers/cyrix/Imakefile
===================================================================
RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/cyrix/Imakefile,v
@@ -4540,6 +4545,32 @@
/* for setvbuf */
#define XF86_IONBF 1
+Index: xc/programs/Xserver/hw/xfree86/os-support/xf86drm.h
+===================================================================
+RCS file: /cvs/xc/programs/Xserver/hw/xfree86/os-support/xf86drm.h,v
+retrieving revision 1.21
+retrieving revision 1.21.2.1
+diff -u -r1.21 -r1.21.2.1
+--- xc/programs/Xserver/hw/xfree86/os-support/xf86drm.h 24 Dec 2002 17:42:59 -0000 1.21
++++ xc/programs/Xserver/hw/xfree86/os-support/xf86drm.h 29 Oct 2003 11:01:59 -0000 1.21.2.1
+@@ -26,7 +26,7 @@
+ *
+ * Author: Rickard E. (Rik) Faith <faith@valinux.com>
+ *
+- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86drm.h,v 1.21 2002/12/24 17:42:59 tsi Exp $
++ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86drm.h,v 1.21.2.1 2003/10/29 11:01:59 alanh Exp $
+ *
+ */
+
+@@ -346,7 +346,7 @@
+ ";;\n" \
+ "cmpxchg4.acq %0=%1,%3,ar.ccv" \
+ : "=r" (__result), "=m" (__drm_dummy_lock(lock)) \
+- : "r" (__old), "r" (new) \
++ : "r" ((unsigned long)__old), "r" (new) \
+ : "memory"); \
+ __ret = (__result) != (__old); \
+ } while (0)
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c
===================================================================
RCS file: /cvs/xc/programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c,v
@@ -6654,7 +6685,7 @@
*/
-/* $XFree86: xc/programs/xdm/dpylist.c,v 1.5 2001/12/14 20:01:21 dawes Exp $ */
-+/* $XFree86: xc/programs/xdm/dpylist.c,v 1.5.4.1 2003/09/17 05:58:16 herrb Exp $ */
++/* $XFree86: xc/programs/xdm/dpylist.c,v 1.5.4.1 2003/09/17 05:58:16 herrb Exp $ */
/*
* xdm - display manager daemon
@@ -6702,7 +6733,7 @@
typedef struct auth_ks_struct { auth_cblock _; } auth_wrapper_schedule[16];
-extern void _XdmcpWrapperToOddParity();
-+extern int _XdmcpAuthSetup(unsigned char *, auth_wrapper_schedule);
++extern int _XdmcpAuthSetup(unsigned char *, auth_wrapper_schedule);
+extern int _XdmcpAuthDoIt(unsigned char *, unsigned char *,
+ auth_wrapper_schedule, int);
+extern void _XdmcpWrapperToOddParity(unsigned char *, unsigned char *);
Deleted: branches/4.3.0/sid/debian/patches/453_ia64_fix_drm_deadlock.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/453_ia64_fix_drm_deadlock.diff 2003-11-01 21:54:59 UTC (rev 740)
+++ branches/4.3.0/sid/debian/patches/453_ia64_fix_drm_deadlock.diff 2003-11-01 22:00:16 UTC (rev 741)
@@ -1,28 +0,0 @@
-$Id$
-
-This patch fixes an incorrect locking primitive in ia64 DRM unlocking
-routines that would cause regular deadlocks; this patch is from John Dennis
-via http://bugs.xfree86.org/show_bug.cgi?id=778.
-
---- xc/programs/Xserver/hw/xfree86/os-support/xf86drm.h~ 2003-10-18 16:49:39.000000000 -0500
-+++ xc/programs/Xserver/hw/xfree86/os-support/xf86drm.h 2003-10-18 16:56:13.000000000 -0500
-@@ -257,8 +257,8 @@
-
- #define __drm_dummy_lock(lock) (*(__volatile__ unsigned int *)lock)
-
--#define DRM_LOCK_HELD 0x80000000 /* Hardware lock is held */
--#define DRM_LOCK_CONT 0x40000000 /* Hardware lock is contended */
-+#define DRM_LOCK_HELD 0x80000000U /* Hardware lock is held */
-+#define DRM_LOCK_CONT 0x40000000U /* Hardware lock is contended */
-
- #if defined(__GNUC__) && (__GNUC__ >= 2)
- # if defined(__i386) || defined(__x86_64__)
-@@ -346,7 +346,7 @@
- ";;\n" \
- "cmpxchg4.acq %0=%1,%3,ar.ccv" \
- : "=r" (__result), "=m" (__drm_dummy_lock(lock)) \
-- : "r" (__old), "r" (new) \
-+ : "r" ((unsigned long)__old), "r" (new) \
- : "memory"); \
- __ret = (__result) != (__old); \
- } while (0)
Reply to: