Attachment 22898 Details for Bug 16549 – alpha locking fix

[patch] alpha locking fix

alpha_drm_cas.patch (text/plain), 1.86 KB, created by Ivan Kokshaysky on 2009-02-13 04:50:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Kokshaysky

Created: 2009-02-13 04:50:54 UTC

Size: 1.86 KB

patch

obsolete

>--- libdrm-2.4.4/libdrm/xf86drm.h.orig	Wed Dec 17 21:28:24 2008
>+++ libdrm-2.4.4/libdrm/xf86drm.h	Wed Feb 11 03:07:05 2009
>@@ -325,28 +325,28 @@ typedef struct _drmSetVersion {
> 
> #elif defined(__alpha__)
> 
>-#define	DRM_CAS(lock, old, new, ret) 		\
>- 	do {					\
>- 		int old32;                      \
>- 		int cur32;			\
>- 		__asm__ __volatile__(		\
>- 		"       mb\n"			\
>- 		"       zap   %4, 0xF0, %0\n"   \
>- 		"       ldl_l %1, %2\n"		\
>- 		"       zap   %1, 0xF0, %1\n"   \
>-                "       cmpeq %0, %1, %1\n"	\
>-                "       beq   %1, 1f\n"		\
>- 		"       bis   %5, %5, %1\n"	\
>-                "       stl_c %1, %2\n"		\
>-                "1:     xor   %1, 1, %1\n"	\
>-                "       stl   %1, %3"		\
>-                : "=r" (old32),                 \
>-		  "=&r" (cur32),		\
>-                   "=m" (__drm_dummy_lock(lock)),\
>-                   "=m" (ret)			\
>- 		: "r" (old),			\
>- 		  "r" (new));			\
>- 	} while(0)
>+#define	DRM_CAS(lock, old, new, ret)		\
>+	do {					\
>+		int tmp, old32;			\
>+		__asm__ __volatile__(		\
>+		"	addl	$31, %5, %3\n"	\
>+		"1:	ldl_l	%0, %2\n"	\
>+		"	cmpeq	%0, %3, %1\n"	\
>+		"	beq	%1, 2f\n"	\
>+		"	mov	%4, %0\n"	\
>+		"	stl_c	%0, %2\n"	\
>+		"	beq	%0, 3f\n"	\
>+		"	mb\n"			\
>+		"2:	cmpeq	%1, 0, %1\n"	\
>+		".subsection 2\n"		\
>+		"3:	br	1b\n"		\
>+		".previous"			\
>+		: "=&r"(tmp), "=&r"(ret),	\
>+		  "=m"(__drm_dummy_lock(lock)),	\
>+		  "=&r"(old32)			\
>+		: "r"(new), "r"(old)		\
>+		: "memory");			\
>+	} while (0)
> 
> #elif defined(__sparc__)
> 
>@@ -429,7 +429,9 @@ do {	register unsigned int __old __asm("
> #define DRM_CAS(lock,old,new,ret) do { ret=1; } while (0) /* FAST LOCK FAILS */
> #endif
> 
>-#if defined(__alpha__) || defined(__powerpc__)
>+#if defined(__alpha__)
>+#define DRM_CAS_RESULT(_result)		long _result
>+#elif defined(__powerpc__)
> #define DRM_CAS_RESULT(_result)		int _result
> #else
> #define DRM_CAS_RESULT(_result)		char _result

Actions: View | Splinter Review

Attachments on bug 16549: 17433 | 17434 | 17435 | 17447 | 17448 | 17449 | 17450 | 22217 | 22218 | 22419 | 22420 | 22506 | 22697 | 22898

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.