aboutsummaryrefslogtreecommitdiffstats
path: root/radeon
diff options
context:
space:
mode:
authorEmil Velikov2015-03-23 17:28:00 -0500
committerEmil Velikov2015-04-28 05:18:43 -0500
commitab84a95e85eb88a4f6020100526ddfbd667d00a2 (patch)
tree404d1468b98a4bf973be63d13bd56baadf55cd13 /radeon
parent40902b9fa12e41f28706e5fca6289ef26f6d81bc (diff)
downloadexternal-libdrm-ab84a95e85eb88a4f6020100526ddfbd667d00a2.tar.gz
external-libdrm-ab84a95e85eb88a4f6020100526ddfbd667d00a2.tar.xz
external-libdrm-ab84a95e85eb88a4f6020100526ddfbd667d00a2.zip
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)
44pkgconfigdir = @pkgconfigdir@ 44pkgconfigdir = @pkgconfigdir@
45pkgconfig_DATA = libdrm_radeon.pc 45pkgconfig_DATA = libdrm_radeon.pc
46 46
47EXTRA_DIST = Android.mk 47EXTRA_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 := \
4 radeon_cs_space.c \ 4 radeon_cs_space.c \
5 radeon_bo.c \ 5 radeon_bo.c \
6 radeon_cs.c \ 6 radeon_cs.c \
7 radeon_surface.c \ 7 radeon_surface.c
8 bof.c \
9 bof.h
10 8
11LIBDRM_RADEON_H_FILES := \ 9LIBDRM_RADEON_H_FILES := \
12 radeon_bo.h \ 10 radeon_bo.h \
@@ -17,3 +15,7 @@ LIBDRM_RADEON_H_FILES := \
17 radeon_bo_int.h \ 15 radeon_bo_int.h \
18 radeon_cs_int.h \ 16 radeon_cs_int.h \
19 r600_pci_ids.h 17 r600_pci_ids.h
18
19LIBDRM_RADEON_BOF_FILES := \
20 bof.c \
21 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 @@
48#include "xf86drm.h" 48#include "xf86drm.h"
49#include "xf86atomic.h" 49#include "xf86atomic.h"
50#include "radeon_drm.h" 50#include "radeon_drm.h"
51#include "bof.h"
52 51
52/* Add LIBDRM_RADEON_BOF_FILES to libdrm_radeon_la_SOURCES when building with BOF_DUMP */
53#define CS_BOF_DUMP 0 53#define CS_BOF_DUMP 0
54#if CS_BOF_DUMP
55#include "bof.h"
56#endif
54 57
55struct radeon_cs_manager_gem { 58struct radeon_cs_manager_gem {
56 struct radeon_cs_manager base; 59 struct radeon_cs_manager base;