radeonsi: move r600_query.c/h files to si_query.c/h

Acked-by: Timothy Arceri <[email protected]>

11 files changed, 15 insertions, 15 deletions

diff --git a/src/gallium/drivers/radeon/Makefile.sources b/src/gallium/drivers/radeon/Makefile.sources
index 8c355ef4fa4..789a3474c83 100644
--- a/src/gallium/drivers/radeon/Makefile.sources
+++ b/src/gallium/drivers/radeon/Makefile.sources
@@ -3,8 +3,6 @@ C_SOURCES := \
 	r600_gpu_load.c \
 	r600_perfcounter.c \
 	r600_pipe_common.h \
-	r600_query.c \
-	r600_query.h \
 	r600_texture.c \
 	radeon_uvd.c \
 	radeon_uvd.h \
diff --git a/src/gallium/drivers/radeon/r600_gpu_load.c b/src/gallium/drivers/radeon/r600_gpu_load.c
index 660ac1d0725..8c457b30eaa 100644
--- a/src/gallium/drivers/radeon/r600_gpu_load.c
+++ b/src/gallium/drivers/radeon/r600_gpu_load.c
@@ -33,7 +33,7 @@
  */
 
 #include "radeonsi/si_pipe.h"
-#include "r600_query.h"
+#include "radeonsi/si_query.h"
 #include "util/os_time.h"
 
 /* For good accuracy at 1000 fps or lower. This will be inaccurate for higher
diff --git a/src/gallium/drivers/radeon/r600_perfcounter.c b/src/gallium/drivers/radeon/r600_perfcounter.c
index c5b55cdcc3b..57c3246898a 100644
--- a/src/gallium/drivers/radeon/r600_perfcounter.c
+++ b/src/gallium/drivers/radeon/r600_perfcounter.c
@@ -23,7 +23,7 @@
  */
 
 #include "util/u_memory.h"
-#include "r600_query.h"
+#include "radeonsi/si_query.h"
 #include "radeonsi/si_pipe.h"
 #include "amd/common/sid.h"
 
diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h
index fd94211fe6b..1e0bf760567 100644
--- a/src/gallium/drivers/radeon/r600_pipe_common.h
+++ b/src/gallium/drivers/radeon/r600_pipe_common.h
@@ -434,12 +434,6 @@ unsigned si_end_counter(struct si_screen *sscreen, unsigned type,
 /* r600_perfcounters.c */
 void si_perfcounters_destroy(struct si_screen *sscreen);
 
-/* r600_query.c */
-void si_init_screen_query_functions(struct si_screen *sscreen);
-void si_init_query_functions(struct si_context *sctx);
-void si_suspend_queries(struct si_context *sctx);
-void si_resume_queries(struct si_context *sctx);
-
 /* r600_texture.c */
 bool si_prepare_for_dma_blit(struct si_context *sctx,
 			     struct r600_texture *rdst,
diff --git a/src/gallium/drivers/radeon/r600_texture.c b/src/gallium/drivers/radeon/r600_texture.c
index cdca6c1f48d..77117ea961c 100644
--- a/src/gallium/drivers/radeon/r600_texture.c
+++ b/src/gallium/drivers/radeon/r600_texture.c
@@ -24,7 +24,7 @@
  */
 
 #include "radeonsi/si_pipe.h"
-#include "r600_query.h"
+#include "radeonsi/si_query.h"
 #include "util/u_format.h"
 #include "util/u_log.h"
 #include "util/u_memory.h"
diff --git a/src/gallium/drivers/radeonsi/Makefile.sources b/src/gallium/drivers/radeonsi/Makefile.sources
index be9c171f419..4182b8af489 100644
--- a/src/gallium/drivers/radeonsi/Makefile.sources
+++ b/src/gallium/drivers/radeonsi/Makefile.sources
@@ -23,6 +23,8 @@ C_SOURCES := \
 	si_pm4.h \
 	si_perfcounter.c \
 	si_public.h \
+	si_query.c \
+	si_query.h \
 	si_shader.c \
 	si_shader.h \
 	si_shader_internal.h \
diff --git a/src/gallium/drivers/radeonsi/si_perfcounter.c b/src/gallium/drivers/radeonsi/si_perfcounter.c
index 0593d5523b8..7ab995cacc9 100644
--- a/src/gallium/drivers/radeonsi/si_perfcounter.c
+++ b/src/gallium/drivers/radeonsi/si_perfcounter.c
@@ -23,7 +23,7 @@
  */
 
 #include "si_build_pm4.h"
-#include "radeon/r600_query.h"
+#include "si_query.h"
 #include "util/u_memory.h"
 
 
diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h
index ab58ec5a484..8e00861ae3a 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.h
+++ b/src/gallium/drivers/radeonsi/si_pipe.h
@@ -840,6 +840,12 @@ void si_init_perfcounters(struct si_screen *screen);
 /* si_pipe.c */
 bool si_check_device_reset(struct si_context *sctx);
 
+/* si_query.c */
+void si_init_screen_query_functions(struct si_screen *sscreen);
+void si_init_query_functions(struct si_context *sctx);
+void si_suspend_queries(struct si_context *sctx);
+void si_resume_queries(struct si_context *sctx);
+
 /* si_test_dma.c */
 void si_test_dma(struct si_screen *sscreen);
 
diff --git a/src/gallium/drivers/radeon/r600_query.c b/src/gallium/drivers/radeonsi/si_query.c
index 171f4838f47..67c323aa959 100644
--- a/src/gallium/drivers/radeon/r600_query.c
+++ b/src/gallium/drivers/radeonsi/si_query.c
@@ -24,8 +24,8 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "radeonsi/si_pipe.h"
-#include "r600_query.h"
+#include "si_pipe.h"
+#include "si_query.h"
 #include "util/u_memory.h"
 #include "util/u_upload_mgr.h"
 #include "util/os_time.h"
diff --git a/src/gallium/drivers/radeon/r600_query.h b/src/gallium/drivers/radeonsi/si_query.h
index 3f60208e2f8..3f60208e2f8 100644
--- a/src/gallium/drivers/radeon/r600_query.h
+++ b/src/gallium/drivers/radeonsi/si_query.h
diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index e4de521cac8..60eec54eb3c 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -24,7 +24,7 @@
 
 #include "si_build_pm4.h"
 #include "gfx9d.h"
-#include "radeon/r600_query.h"
+#include "si_query.h"
 
 #include "util/u_dual_blend.h"
 #include "util/u_format.h"