X Strike Force XFree86 SVN commit: rev 669 - branches/4.3.0/sid/debian/patches
Author: branden
Date: 2003-10-18 17:02:28 -0500 (Sat, 18 Oct 2003)
New Revision: 669
Modified:
branches/4.3.0/sid/debian/patches/453_ia64_fix_radeon_dri_deadlock.diff
Log:
Correct patch so it actually applies. Make minor correction to
explanation.
- debian/patches/453_ia64_fix_radeon_dri_deadlock.diff
Modified: branches/4.3.0/sid/debian/patches/453_ia64_fix_radeon_dri_deadlock.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/453_ia64_fix_radeon_dri_deadlock.diff 2003-10-18 20:38:47 UTC (rev 668)
+++ branches/4.3.0/sid/debian/patches/453_ia64_fix_radeon_dri_deadlock.diff 2003-10-18 22:02:28 UTC (rev 669)
@@ -1,23 +1,23 @@
$Id$
-This patch fixes an incorrect locking primitive in ia64 DRI unlocking
+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.orig 2003-10-10 16:07:37.000000000 -0400
-+++ xc/programs/Xserver/hw/xfree86/os-support/xf86drm.h 2003-10-10 16:09:27.000000000 -0400
-@@ -285,8 +285,8 @@
+--- 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 */
+-#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(__AMD64__)
-@@ -378,7 +378,7 @@
+ # 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)) \
Reply to: