libdrm: Move intel_atomic.h to libdrm core for sharing.
authorPauli Nieminen <suokkos@gmail.com>
Wed, 10 Mar 2010 11:35:59 +0000 (13:35 +0200)
committerPauli Nieminen <suokkos@gmail.com>
Wed, 17 Mar 2010 09:48:00 +0000 (11:48 +0200)
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>
Makefile.am
configure.ac
intel/Makefile.am
intel/intel_bufmgr_gem.c
xf86atomic.h [moved from intel/intel_atomic.h with 93% similarity]

index ee3ccc701ee9ea5c9eb08a931e97ef5059fe8ee2..25d174707464119dadecc602b9f933ac5c8b4dd5 100644 (file)
@@ -56,6 +56,7 @@ libdrm_la_SOURCES =                           \
        xf86drmRandom.c                         \
        xf86drmSL.c                             \
        xf86drmMode.c                           \
        xf86drmRandom.c                         \
        xf86drmSL.c                             \
        xf86drmMode.c                           \
+       xf86atomic.h                            \
        libdrm_lists.h
 
 libdrmincludedir = ${includedir}
        libdrm_lists.h
 
 libdrmincludedir = ${includedir}
index aaa8efae6006ff8023af328a05d9ec0ccc292438..953a75867033b52490455a3e7ad13fef0311ec61 100644 (file)
@@ -198,7 +198,7 @@ if test "x$INTEL" != "xno"; then
 
     ])
     if test "x$drm_cv_atomic_primitives" = xIntel; 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
                      [Enable if your compiler supports the Intel __sync_* atomic primitives])
     fi
     if test "x$drm_cv_atomic_primitives" = "xlibatomic-ops"; then
index 8bb2c6e31b969dd401d26245e683443f6d7fd530..9add505052e21b862683410f3aca390811845d57 100644 (file)
@@ -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 = \
 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 \
        intel_bufmgr.c \
        intel_bufmgr_priv.h \
        intel_bufmgr_fake.c \
index 88385363300ae1c42c7ebeb82fe1d95c8d2404cc..c3b5d6aeb65b54a06a15df818e4f47e1cf57a83d 100644 (file)
@@ -39,6 +39,7 @@
 #endif
 
 #include <xf86drm.h>
 #endif
 
 #include <xf86drm.h>
+#include <xf86atomic.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -53,7 +54,6 @@
 
 #include "errno.h"
 #include "libdrm_lists.h"
 
 #include "errno.h"
 #include "libdrm_lists.h"
-#include "intel_atomic.h"
 #include "intel_bufmgr.h"
 #include "intel_bufmgr_priv.h"
 #include "intel_chipset.h"
 #include "intel_bufmgr.h"
 #include "intel_bufmgr_priv.h"
 #include "intel_chipset.h"
similarity index 93%
rename from intel/intel_atomic.h
rename to xf86atomic.h
index 12bb96bc0540a8f5be953f89eea90770df1c2a88..de8e220e02e09aeba4c80a0504b15aba424e4f84 100644 (file)
  */
 
 /**
  */
 
 /**
- * @file intel_atomics.h
+ * @file xf86atomics.h
  *
  * Private definitions for atomic operations
  */
 
  *
  * 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
 
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#if HAVE_INTEL_ATOMIC_PRIMITIVES
+#if HAVE_LIBDRM_ATOMIC_PRIMITIVES
 
 #define HAS_ATOMIC_OPS 1
 
 
 #define HAS_ATOMIC_OPS 1
 
@@ -87,7 +87,7 @@ typedef struct { uint_t atomic; } atomic_t;
 #endif
 
 #if ! HAS_ATOMIC_OPS
 #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
 #endif
 
 #endif