Mesa (master): radeonsi: rename SI_TEST_DMA to SI_TEST_BLIT

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 21b97ef013412e646efd66817fe512b324e308b3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=21b97ef013412e646efd66817fe512b324e308b3

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Tue Dec  8 16:50:03 2020 -0500

radeonsi: rename SI_TEST_DMA to SI_TEST_BLIT

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7908>

---

 src/gallium/drivers/radeonsi/Makefile.sources                  | 2 +-
 src/gallium/drivers/radeonsi/meson.build                       | 2 +-
 src/gallium/drivers/radeonsi/si_pipe.c                         | 6 +++---
 src/gallium/drivers/radeonsi/si_pipe.h                         | 6 +++---
 src/gallium/drivers/radeonsi/{si_test_dma.c => si_test_blit.c} | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/Makefile.sources b/src/gallium/drivers/radeonsi/Makefile.sources
index 8fd312a2b6a..25994a13f50 100644
--- a/src/gallium/drivers/radeonsi/Makefile.sources
+++ b/src/gallium/drivers/radeonsi/Makefile.sources
@@ -45,7 +45,7 @@ C_SOURCES := \
 	si_state_streamout.c \
 	si_state_viewport.c \
 	si_state.h \
-	si_test_dma.c \
+	si_test_blit.c \
 	si_test_dma_perf.c \
 	si_texture.c \
 	si_uvd.c \
diff --git a/src/gallium/drivers/radeonsi/meson.build b/src/gallium/drivers/radeonsi/meson.build
index e373cbc63a6..39a8e2342a0 100644
--- a/src/gallium/drivers/radeonsi/meson.build
+++ b/src/gallium/drivers/radeonsi/meson.build
@@ -65,7 +65,7 @@ files_libradeonsi = files(
   'si_state_shaders.c',
   'si_state_streamout.c',
   'si_state_viewport.c',
-  'si_test_dma.c',
+  'si_test_blit.c',
   'si_test_dma_perf.c',
   'si_texture.c',
   'si_uvd.c',
diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
index 774abef234c..ac87400e028 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -119,7 +119,7 @@ static const struct debug_named_value debug_options[] = {
 
 static const struct debug_named_value test_options[] = {
    /* Tests: */
-   {"testdma", DBG(TEST_DMA), "Invoke blit tests and exit."},
+   {"blit", DBG(TEST_BLIT), "Invoke blit tests and exit."},
    {"testvmfaultcp", DBG(TEST_VMFAULT_CP), "Invoke a CP VM fault test and exit."},
    {"testvmfaultshader", DBG(TEST_VMFAULT_SHADER), "Invoke a shader VM fault test and exit."},
    {"testdmaperf", DBG(TEST_DMA_PERF), "Test DMA performance"},
@@ -1288,8 +1288,8 @@ static struct pipe_screen *radeonsi_screen_create_impl(struct radeon_winsys *ws,
       sscreen->aux_context->set_log_context(sscreen->aux_context, log);
    }
 
-   if (test_flags & DBG(TEST_DMA))
-      si_test_dma(sscreen);
+   if (test_flags & DBG(TEST_BLIT))
+      si_test_blit(sscreen);
 
    if (test_flags & DBG(TEST_DMA_PERF)) {
       si_test_dma_perf(sscreen);
diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h
index 0e8a2a6813b..f719415e6fc 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.h
+++ b/src/gallium/drivers/radeonsi/si_pipe.h
@@ -216,7 +216,7 @@ enum
 enum
 {
    /* Tests: */
-   DBG_TEST_DMA,
+   DBG_TEST_BLIT,
    DBG_TEST_VMFAULT_CP,
    DBG_TEST_VMFAULT_SHADER,
    DBG_TEST_DMA_PERF,
@@ -1479,8 +1479,8 @@ void *gfx10_create_sh_query_result_cs(struct si_context *sctx);
 void gfx10_init_query(struct si_context *sctx);
 void gfx10_destroy_query(struct si_context *sctx);
 
-/* si_test_dma.c */
-void si_test_dma(struct si_screen *sscreen);
+/* si_test_blit.c */
+void si_test_blit(struct si_screen *sscreen);
 
 /* si_test_clearbuffer.c */
 void si_test_dma_perf(struct si_screen *sscreen);
diff --git a/src/gallium/drivers/radeonsi/si_test_dma.c b/src/gallium/drivers/radeonsi/si_test_blit.c
similarity index 99%
rename from src/gallium/drivers/radeonsi/si_test_dma.c
rename to src/gallium/drivers/radeonsi/si_test_blit.c
index d56b0e40671..a9077603fef 100644
--- a/src/gallium/drivers/radeonsi/si_test_dma.c
+++ b/src/gallium/drivers/radeonsi/si_test_blit.c
@@ -166,7 +166,7 @@ static unsigned generate_max_tex_side(unsigned max_tex_side)
    }
 }
 
-void si_test_dma(struct si_screen *sscreen)
+void si_test_blit(struct si_screen *sscreen)
 {
    struct pipe_screen *screen = &sscreen->b;
    struct pipe_context *ctx = screen->context_create(screen, NULL, 0);