geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
main
Pauli Nieminen 2010-03-10 13:35:59 +02:00
parent df7157fe2e
commit 21105bc186
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -56,6 +56,7 @@ libdrm_la_SOURCES = \
xf86drmRandom.c \ xf86drmRandom.c \
xf86drmSL.c \ xf86drmSL.c \
xf86drmMode.c \ xf86drmMode.c \
xf86atomic.h \
libdrm_lists.h libdrm_lists.h
libdrmincludedir = ${includedir} libdrmincludedir = ${includedir}

2
configure.ac
View 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]) [Enable if your compiler supports the Intel __sync_* atomic primitives])
fi fi
if test "x$drm_cv_atomic_primitives" = "xlibatomic-ops"; then if test "x$drm_cv_atomic_primitives" = "xlibatomic-ops"; then

1
intel/Makefile.am
View 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_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @CLOCK_LIB@
libdrm_intel_la_SOURCES = \ libdrm_intel_la_SOURCES = \
intel_atomic.h \
intel_bufmgr.c \ intel_bufmgr.c \
intel_bufmgr_priv.h \ intel_bufmgr_priv.h \
intel_bufmgr_fake.c \ intel_bufmgr_fake.c \

2
intel/intel_bufmgr_gem.c
View File

@ -39,6 +39,7 @@
#endif #endif
#include <xf86drm.h> #include <xf86drm.h>
#include <xf86atomic.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -53,7 +54,6 @@
#include "errno.h" #include "errno.h"
#include "libdrm_lists.h" #include "libdrm_lists.h"
#include "intel_atomic.h"
#include "intel_bufmgr.h" #include "intel_bufmgr.h"
#include "intel_bufmgr_priv.h" #include "intel_bufmgr_priv.h"
#include "intel_chipset.h" #include "intel_chipset.h"

10
intel/intel_atomic.h → xf86atomic.h
View File

@ -26,19 +26,19 @@
*/ */
/** /**
* @file intel_atomics.h * @file xf86atomics.h
* *
* Private definitions for atomic operations * Private definitions for atomic operations
*/ */
#ifndef INTEL_ATOMICS_H #ifndef LIBDRM_ATOMICS_H
#define INTEL_ATOMICS_H #define LIBDRM_ATOMICS_H
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif #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 #endif
#if ! HAS_ATOMIC_OPS #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