[47/55] radeonsi: move r600_gpu_load.c to si_gpu_load.c

Submitted by Marek Olšák on April 2, 2018, 4:08 a.m.

Details

Message ID 1522642128-15348-48-git-send-email-maraeo@gmail.com
State Accepted
Commit d58080b318ebb360e3ed8c2dc479f348345c0799
Headers show
Series "RadeonSI Mega cleanup" ( rev: 1 ) in Mesa

Not browsing as part of any series.

Commit Message

Marek Olšák April 2, 2018, 4:08 a.m.
From: Marek Olšák <marek.olsak@amd.com>

---
 src/gallium/drivers/radeon/Makefile.am                              | 4 +---
 src/gallium/drivers/radeon/Makefile.sources                         | 1 -
 src/gallium/drivers/radeon/r600_pipe_common.h                       | 6 ------
 src/gallium/drivers/radeonsi/Makefile.am                            | 4 +++-
 src/gallium/drivers/radeonsi/Makefile.sources                       | 1 +
 .../drivers/{radeon/r600_gpu_load.c => radeonsi/si_gpu_load.c}      | 0
 src/gallium/drivers/radeonsi/si_pipe.h                              | 6 ++++++
 7 files changed, 11 insertions(+), 11 deletions(-)
 rename src/gallium/drivers/{radeon/r600_gpu_load.c => radeonsi/si_gpu_load.c} (100%)

Patch hide | download patch | download mbox

diff --git a/src/gallium/drivers/radeon/Makefile.am b/src/gallium/drivers/radeon/Makefile.am
index 43dc35c..1e1d49e 100644
--- a/src/gallium/drivers/radeon/Makefile.am
+++ b/src/gallium/drivers/radeon/Makefile.am
@@ -5,9 +5,7 @@  include $(top_srcdir)/src/gallium/Automake.inc
 AM_CFLAGS = \
 	$(GALLIUM_DRIVER_CFLAGS) \
 	$(RADEON_CFLAGS) \
-	-I$(top_srcdir)/src/amd/common \
-	-Wstrict-overflow=0
-# ^^ disable warnings about overflows (os_time_timeout)
+	-I$(top_srcdir)/src/amd/common
 
 noinst_LTLIBRARIES = libradeon.la
 
diff --git a/src/gallium/drivers/radeon/Makefile.sources b/src/gallium/drivers/radeon/Makefile.sources
index 789a347..dd08b22 100644
--- a/src/gallium/drivers/radeon/Makefile.sources
+++ b/src/gallium/drivers/radeon/Makefile.sources
@@ -1,6 +1,5 @@ 
 C_SOURCES := \
 	r600_buffer_common.c \
-	r600_gpu_load.c \
 	r600_perfcounter.c \
 	r600_pipe_common.h \
 	r600_texture.c \
diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h
index 1e0bf76..4e377d4 100644
--- a/src/gallium/drivers/radeon/r600_pipe_common.h
+++ b/src/gallium/drivers/radeon/r600_pipe_common.h
@@ -425,12 +425,6 @@  void si_replace_buffer_storage(struct pipe_context *ctx,
 void si_init_screen_buffer_functions(struct si_screen *sscreen);
 void si_init_buffer_functions(struct si_context *sctx);
 
-/* r600_gpu_load.c */
-void si_gpu_load_kill_thread(struct si_screen *sscreen);
-uint64_t si_begin_counter(struct si_screen *sscreen, unsigned type);
-unsigned si_end_counter(struct si_screen *sscreen, unsigned type,
-			uint64_t begin);
-
 /* r600_perfcounters.c */
 void si_perfcounters_destroy(struct si_screen *sscreen);
 
diff --git a/src/gallium/drivers/radeonsi/Makefile.am b/src/gallium/drivers/radeonsi/Makefile.am
index 8c701fa..b39c559 100644
--- a/src/gallium/drivers/radeonsi/Makefile.am
+++ b/src/gallium/drivers/radeonsi/Makefile.am
@@ -29,7 +29,9 @@  AM_CFLAGS = \
 	-I$(top_builddir)/src/compiler/nir \
 	-I$(top_srcdir)/src/amd/common \
 	$(RADEON_CFLAGS) \
-	$(LLVM_CFLAGS)
+	$(LLVM_CFLAGS) \
+	-Wstrict-overflow=0
+# ^^ disable warnings about overflows (os_time_timeout)
 
 noinst_LTLIBRARIES = libradeonsi.la
 
diff --git a/src/gallium/drivers/radeonsi/Makefile.sources b/src/gallium/drivers/radeonsi/Makefile.sources
index 4182b8a..c008fc6 100644
--- a/src/gallium/drivers/radeonsi/Makefile.sources
+++ b/src/gallium/drivers/radeonsi/Makefile.sources
@@ -17,6 +17,7 @@  C_SOURCES := \
 	si_fence.c \
 	si_get.c \
 	si_gfx_cs.c \
+	si_gpu_load.c \
 	si_pipe.c \
 	si_pipe.h \
 	si_pm4.c \
diff --git a/src/gallium/drivers/radeon/r600_gpu_load.c b/src/gallium/drivers/radeonsi/si_gpu_load.c
similarity index 100%
rename from src/gallium/drivers/radeon/r600_gpu_load.c
rename to src/gallium/drivers/radeonsi/si_gpu_load.c
diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h
index 00a5f84..d5a868b 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.h
+++ b/src/gallium/drivers/radeonsi/si_pipe.h
@@ -828,6 +828,12 @@  void si_flush_gfx_cs(struct si_context *ctx, unsigned flags,
 void si_begin_new_gfx_cs(struct si_context *ctx);
 void si_need_gfx_cs_space(struct si_context *ctx);
 
+/* r600_gpu_load.c */
+void si_gpu_load_kill_thread(struct si_screen *sscreen);
+uint64_t si_begin_counter(struct si_screen *sscreen, unsigned type);
+unsigned si_end_counter(struct si_screen *sscreen, unsigned type,
+			uint64_t begin);
+
 /* si_compute.c */
 void si_init_compute_functions(struct si_context *sctx);