X Strike Force XFree86 SVN commit: rev 671 - in branches/4.3.0/sid/debian: . patches
Author: branden
Date: 2003-10-18 22:06:02 -0500 (Sat, 18 Oct 2003)
New Revision: 671
Added:
branches/4.3.0/sid/debian/patches/453_ia64_fix_drm_deadlock.diff
Removed:
branches/4.3.0/sid/debian/patches/453_ia64_fix_radeon_dri_deadlock.diff
Modified:
branches/4.3.0/sid/debian/changelog
Log:
Give patch #453 a more accurate name, since the patch is not
video-chipset-specific in any way (and has to do specifically with the
DRM: Direct Rendering Manager).
- debian/patches/453_ia64_fix_drm_deadlock.diff: renamed from
debian/patches/453_ia64_fix_radeon_dri_deadlock.diff
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2003-10-19 02:55:47 UTC (rev 670)
+++ branches/4.3.0/sid/debian/changelog 2003-10-19 03:06:02 UTC (rev 671)
@@ -111,8 +111,14 @@
- debian/xutils.install.m68k: deleted; m68k can now use the generic
xutils.install file
- -- Branden Robinson <branden@debian.org> Thu, 16 Oct 2003 17:51:03 -0500
+ * Give patch #453 a more accurate name, since the patch is not
+ video-chipset-specific in any way (and has to do specifically with the
+ DRM: Direct Rendering Manager).
+ - debian/patches/453_ia64_fix_drm_deadlock.diff: renamed from
+ debian/patches/453_ia64_fix_radeon_dri_deadlock.diff
+ -- Branden Robinson <branden@debian.org> Sat, 18 Oct 2003 22:01:08 -0500
+
xfree86 (4.3.0-0pre1v3) experimental; urgency=high
* Update pam_setcred() security fix to xdm to use pam_error and
Copied: branches/4.3.0/sid/debian/patches/453_ia64_fix_drm_deadlock.diff (from rev 669, branches/4.3.0/sid/debian/patches/453_ia64_fix_radeon_dri_deadlock.diff)
Property changes on: branches/4.3.0/sid/debian/patches/453_ia64_fix_drm_deadlock.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Deleted: 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-19 02:55:47 UTC (rev 670)
+++ branches/4.3.0/sid/debian/patches/453_ia64_fix_radeon_dri_deadlock.diff 2003-10-19 03:06:02 UTC (rev 671)
@@ -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: