diff options
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | intel/intel_atomic.h | 15 |
2 files changed, 21 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index b257ccf6..49e193e3 100644 --- a/configure.ac +++ b/configure.ac @@ -186,6 +186,12 @@ if test "x$INTEL" != "xno"; then AC_CHECK_HEADER([atomic_ops.h], drm_cv_atomic_primitives="libatomic-ops") fi + # atomic functions defined in <atomic.h> & libc on Solaris + if test "x$drm_cv_atomic_primitives" = "xnone"; then + AC_CHECK_FUNC([atomic_cas_uint], + drm_cv_atomic_primitives="Solaris") + fi + ]) if test "x$drm_cv_atomic_primitives" = xIntel; then AC_DEFINE(HAVE_INTEL_ATOMIC_PRIMITIVES, 1, diff --git a/intel/intel_atomic.h b/intel/intel_atomic.h index e725c4a4..12bb96bc 100644 --- a/intel/intel_atomic.h +++ b/intel/intel_atomic.h @@ -71,6 +71,21 @@ typedef struct { #endif +#if defined(__sun) && !defined(HAS_ATOMIC_OPS) /* Solaris & OpenSolaris */ + +#include <sys/atomic.h> +#define HAS_ATOMIC_OPS 1 + +typedef struct { uint_t atomic; } atomic_t; + +# define atomic_read(x) (int) ((x)->atomic) +# define atomic_set(x, val) ((x)->atomic = (uint_t)(val)) +# define atomic_inc(x) (atomic_inc_uint (&(x)->atomic)) +# define atomic_dec_and_test(x) (atomic_dec_uint_nv(&(x)->atomic) == 1) +# define atomic_cmpxchg(x, oldv, newv) atomic_cas_uint (&(x)->atomic, oldv, newv) + +#endif + #if ! HAS_ATOMIC_OPS #error libdrm-intel requires atomic operations, please define them for your CPU/compiler. #endif |