summaryrefslogtreecommitdiff
path: root/radeon
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2015-03-23 22:28:00 +0000
committerEmil Velikov <emil.l.velikov@gmail.com>2015-04-28 11:18:43 +0100
commitab84a95e85eb88a4f6020100526ddfbd667d00a2 (patch)
tree404d1468b98a4bf973be63d13bd56baadf55cd13 /radeon
parent40902b9fa12e41f28706e5fca6289ef26f6d81bc (diff)
radeon: move bof.[ch] out of libdrm_radeon
The functions(files) are used if one explicitly modifies radeon_cs_gem.c by setting CS_BOF_DUMP to 1. As bof.[ch] is used (copied) to other out-of-tree projects, keep them around in the distribution tarball. Cc: Jerome Glisse <jglisse@redhat.com> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Diffstat (limited to 'radeon')
-rw-r--r--radeon/Makefile.am2
-rw-r--r--radeon/Makefile.sources8
-rw-r--r--radeon/radeon_cs_gem.c5
3 files changed, 10 insertions, 5 deletions
diff --git a/radeon/Makefile.am b/radeon/Makefile.am
index 5cca394d..1e4c8691 100644
--- a/radeon/Makefile.am
+++ b/radeon/Makefile.am
@@ -44,4 +44,4 @@ libdrm_radeoninclude_HEADERS = $(LIBDRM_RADEON_H_FILES)
pkgconfigdir = @pkgconfigdir@
pkgconfig_DATA = libdrm_radeon.pc
-EXTRA_DIST = Android.mk
+EXTRA_DIST = Android.mk $(LIBDRM_RADEON_BOF_FILES)
diff --git a/radeon/Makefile.sources b/radeon/Makefile.sources
index a17701aa..1cf482a4 100644
--- a/radeon/Makefile.sources
+++ b/radeon/Makefile.sources
@@ -4,9 +4,7 @@ LIBDRM_RADEON_FILES := \
radeon_cs_space.c \
radeon_bo.c \
radeon_cs.c \
- radeon_surface.c \
- bof.c \
- bof.h
+ radeon_surface.c
LIBDRM_RADEON_H_FILES := \
radeon_bo.h \
@@ -17,3 +15,7 @@ LIBDRM_RADEON_H_FILES := \
radeon_bo_int.h \
radeon_cs_int.h \
r600_pci_ids.h
+
+LIBDRM_RADEON_BOF_FILES := \
+ bof.c \
+ bof.h
diff --git a/radeon/radeon_cs_gem.c b/radeon/radeon_cs_gem.c
index 705ee056..81b31846 100644
--- a/radeon/radeon_cs_gem.c
+++ b/radeon/radeon_cs_gem.c
@@ -48,9 +48,12 @@
#include "xf86drm.h"
#include "xf86atomic.h"
#include "radeon_drm.h"
-#include "bof.h"
+/* Add LIBDRM_RADEON_BOF_FILES to libdrm_radeon_la_SOURCES when building with BOF_DUMP */
#define CS_BOF_DUMP 0
+#if CS_BOF_DUMP
+#include "bof.h"
+#endif
struct radeon_cs_manager_gem {
struct radeon_cs_manager base;