summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPauli Nieminen <suokkos@gmail.com>2010-03-10 13:35:59 +0200
committerPauli Nieminen <suokkos@gmail.com>2010-03-17 11:48:00 +0200
commit21105bc186d188f0bfc2f41c52b4b0ceb6742cf5 (patch)
tree2ab7cc7a721954530c0abea46a115a3b6e6446e5
parentdf7157fe2e28796ae1f6d938b850e08c8e1d382d (diff)
libdrm: Move intel_atomic.h to libdrm core for sharing.
intel_atomic.h includes very usefull atomic operations for lock free parrallel access of variables. Moving these to core libdrm for code sharing with radeon. Signed-off-by: Pauli Nieminen <suokkos@gmail.com>
-rw-r--r--Makefile.am1
-rw-r--r--configure.ac2
-rw-r--r--intel/Makefile.am1
-rw-r--r--intel/intel_bufmgr_gem.c2
-rw-r--r--xf86atomic.h (renamed from intel/intel_atomic.h)10
5 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am
index ee3ccc70..25d17470 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -56,6 +56,7 @@ libdrm_la_SOURCES = \
xf86drmRandom.c \
xf86drmSL.c \
xf86drmMode.c \
+ xf86atomic.h \
libdrm_lists.h
libdrmincludedir = ${includedir}
diff --git a/configure.ac b/configure.ac
index aaa8efae..953a7586 100644
--- a/configure.ac
+++ b/configure.ac
@@ -198,7 +198,7 @@ if test "x$INTEL" != "xno"; then
])
if test "x$drm_cv_atomic_primitives" = xIntel; then
- AC_DEFINE(HAVE_INTEL_ATOMIC_PRIMITIVES, 1,
+ AC_DEFINE(HAVE_LIBDRM_ATOMIC_PRIMITIVES, 1,
[Enable if your compiler supports the Intel __sync_* atomic primitives])
fi
if test "x$drm_cv_atomic_primitives" = "xlibatomic-ops"; then
diff --git a/intel/Makefile.am b/intel/Makefile.am
index 8bb2c6e3..9add5050 100644
--- a/intel/Makefile.am
+++ b/intel/Makefile.am
@@ -35,7 +35,6 @@ libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @CLOCK_LIB@
libdrm_intel_la_SOURCES = \
- intel_atomic.h \
intel_bufmgr.c \
intel_bufmgr_priv.h \
intel_bufmgr_fake.c \
diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
index 88385363..c3b5d6ae 100644
--- a/intel/intel_bufmgr_gem.c
+++ b/intel/intel_bufmgr_gem.c
@@ -39,6 +39,7 @@
#endif
#include <xf86drm.h>
+#include <xf86atomic.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
@@ -53,7 +54,6 @@
#include "errno.h"
#include "libdrm_lists.h"
-#include "intel_atomic.h"
#include "intel_bufmgr.h"
#include "intel_bufmgr_priv.h"
#include "intel_chipset.h"
diff --git a/intel/intel_atomic.h b/xf86atomic.h
index 12bb96bc..de8e220e 100644
--- a/intel/intel_atomic.h
+++ b/xf86atomic.h
@@ -26,19 +26,19 @@
*/
/**
- * @file intel_atomics.h
+ * @file xf86atomics.h
*
* Private definitions for atomic operations
*/
-#ifndef INTEL_ATOMICS_H
-#define INTEL_ATOMICS_H
+#ifndef LIBDRM_ATOMICS_H
+#define LIBDRM_ATOMICS_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
-#if HAVE_INTEL_ATOMIC_PRIMITIVES
+#if HAVE_LIBDRM_ATOMIC_PRIMITIVES
#define HAS_ATOMIC_OPS 1
@@ -87,7 +87,7 @@ typedef struct { uint_t atomic; } atomic_t;
#endif
#if ! HAS_ATOMIC_OPS
-#error libdrm-intel requires atomic operations, please define them for your CPU/compiler.
+#error libdrm requires atomic operations, please define them for your CPU/compiler.
#endif
#endif