radeonsi: only expose *_init_*dma_functions from (S)DMA files

just normalizing the interfaces

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>

diff --git a/src/gallium/drivers/radeonsi/cik_sdma.c b/src/gallium/drivers/radeonsi/cik_sdma.c
index 7f7db91803dba4c2ab70bdb3a0e73fb512e90939..a8caf04909fbd0d24491d8ae2f9c7531dd309ace 100644 (file)
--- a/src/gallium/drivers/radeonsi/cik_sdma.c
+++ b/src/gallium/drivers/radeonsi/cik_sdma.c
@@ -193,13 +193,13 @@ static void cik_sdma_copy_tile(struct si_context *ctx,
        }
 }
 
-void cik_sdma_copy(struct pipe_context *ctx,
-                  struct pipe_resource *dst,
-                  unsigned dst_level,
-                  unsigned dstx, unsigned dsty, unsigned dstz,
-                  struct pipe_resource *src,
-                  unsigned src_level,
-                  const struct pipe_box *src_box)
+static void cik_sdma_copy(struct pipe_context *ctx,
+                         struct pipe_resource *dst,
+                         unsigned dst_level,
+                         unsigned dstx, unsigned dsty, unsigned dstz,
+                         struct pipe_resource *src,
+                         unsigned src_level,
+                         const struct pipe_box *src_box)
 {
        struct si_context *sctx = (struct si_context *)ctx;
        struct r600_texture *rsrc = (struct r600_texture*)src;
@@ -324,3 +324,8 @@ fallback:
        si_resource_copy_region(ctx, dst, dst_level, dstx, dsty, dstz,
                                src, src_level, src_box);
 }
+
+void cik_init_sdma_functions(struct si_context *sctx)
+{
+       sctx->b.dma_copy = cik_sdma_copy;
+}

diff --git a/src/gallium/drivers/radeonsi/si_dma.c b/src/gallium/drivers/radeonsi/si_dma.c
index 84961d5a13cfdcb9ffaf0f36ab2c6cadf229cb92..033eb7b147934824296d84b42eb31a6445fd4f9f 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_dma.c
+++ b/src/gallium/drivers/radeonsi/si_dma.c
@@ -190,13 +190,13 @@ static void si_dma_copy_tile(struct si_context *ctx,
        }
 }
 
-void si_dma_copy(struct pipe_context *ctx,
-                struct pipe_resource *dst,
-                unsigned dst_level,
-                unsigned dstx, unsigned dsty, unsigned dstz,
-                struct pipe_resource *src,
-                unsigned src_level,
-                const struct pipe_box *src_box)
+static void si_dma_copy(struct pipe_context *ctx,
+                       struct pipe_resource *dst,
+                       unsigned dst_level,
+                       unsigned dstx, unsigned dsty, unsigned dstz,
+                       struct pipe_resource *src,
+                       unsigned src_level,
+                       const struct pipe_box *src_box)
 {
        struct si_context *sctx = (struct si_context *)ctx;
        struct r600_texture *rsrc = (struct r600_texture*)src;
@@ -293,3 +293,8 @@ fallback:
        si_resource_copy_region(ctx, dst, dst_level, dstx, dsty, dstz,
                                src, src_level, src_box);
 }
+
+void si_init_dma_functions(struct si_context *sctx)
+{
+       sctx->b.dma_copy = si_dma_copy;
+}

diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
index 1a69f43c8c28c49992d082a5ab9f925bb49d3a8b..f2692dc9058649bf6a4e08b3b144994a4fad4fbb 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -192,6 +192,11 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen,
        si_init_state_functions(sctx);
        si_init_shader_functions(sctx);
 
+       if (sctx->b.chip_class >= CIK)
+               cik_init_sdma_functions(sctx);
+       else
+               si_init_dma_functions(sctx);
+
        if (sscreen->b.debug_flags & DBG_FORCE_DMA)
                sctx->b.b.resource_copy_region = sctx->b.dma_copy;
 

diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h
index d31e9a93ef93025de31d7265db7660c6316d29eb..33d3d259e2ac9f4b774992f68151fe037675316b 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_pipe.h
+++ b/src/gallium/drivers/radeonsi/si_pipe.h
@@ -325,13 +325,7 @@ struct si_context {
 };
 
 /* cik_sdma.c */
-void cik_sdma_copy(struct pipe_context *ctx,
-                  struct pipe_resource *dst,
-                  unsigned dst_level,
-                  unsigned dstx, unsigned dsty, unsigned dstz,
-                  struct pipe_resource *src,
-                  unsigned src_level,
-                  const struct pipe_box *src_box);
+void cik_init_sdma_functions(struct si_context *sctx);
 
 /* si_blit.c */
 void si_init_blit_functions(struct si_context *sctx);
@@ -357,13 +351,7 @@ void si_check_vm_faults(struct si_context *sctx);
 bool si_replace_shader(unsigned num, struct radeon_shader_binary *binary);
 
 /* si_dma.c */
-void si_dma_copy(struct pipe_context *ctx,
-                struct pipe_resource *dst,
-                unsigned dst_level,
-                unsigned dstx, unsigned dsty, unsigned dstz,
-                struct pipe_resource *src,
-                unsigned src_level,
-                const struct pipe_box *src_box);
+void si_init_dma_functions(struct si_context *sctx);
 
 /* si_hw_context.c */
 void si_context_gfx_flush(void *context, unsigned flags,

diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index c4af77e149c8147edeb5a70403335deac82c7ede..8eb2b3dd6b04f9ec89baf360d14b68821ce644aa 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -3387,12 +3387,6 @@ void si_init_state_functions(struct si_context *sctx)
 
        sctx->b.b.draw_vbo = si_draw_vbo;
 
-       if (sctx->b.chip_class >= CIK) {
-               sctx->b.dma_copy = cik_sdma_copy;
-       } else {
-               sctx->b.dma_copy = si_dma_copy;
-       }
-
        si_init_config(sctx);
 }