[Mesa-dev] [PATCH 3/3] r600g: use more appropriate names for async DMA functions
Marek Olšák
maraeo at gmail.com
Sun Mar 16 17:44:58 PDT 2014
From: Marek Olšák <marek.olsak at amd.com>
*_dma_copy calls either *_dma_copy_buffer or *_dma_copy_tile.
---
src/gallium/drivers/r600/evergreen_hw_context.c | 12 ++++++------
src/gallium/drivers/r600/evergreen_state.c | 8 ++++----
src/gallium/drivers/r600/r600_hw_context.c | 12 ++++++------
src/gallium/drivers/r600/r600_pipe.h | 24 ++++++++++++------------
src/gallium/drivers/r600/r600_state.c | 8 ++++----
5 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/src/gallium/drivers/r600/evergreen_hw_context.c b/src/gallium/drivers/r600/evergreen_hw_context.c
index 20ebbee..32640bb 100644
--- a/src/gallium/drivers/r600/evergreen_hw_context.c
+++ b/src/gallium/drivers/r600/evergreen_hw_context.c
@@ -28,12 +28,12 @@
#include "util/u_memory.h"
#include "util/u_math.h"
-void evergreen_dma_copy(struct r600_context *rctx,
- struct pipe_resource *dst,
- struct pipe_resource *src,
- uint64_t dst_offset,
- uint64_t src_offset,
- uint64_t size)
+void evergreen_dma_copy_buffer(struct r600_context *rctx,
+ struct pipe_resource *dst,
+ struct pipe_resource *src,
+ uint64_t dst_offset,
+ uint64_t src_offset,
+ uint64_t size)
{
struct radeon_winsys_cs *cs = rctx->b.rings.dma.cs;
unsigned i, ncopy, csize, sub_cmd, shift;
diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c
index 6db1683..62f70c9 100644
--- a/src/gallium/drivers/r600/evergreen_state.c
+++ b/src/gallium/drivers/r600/evergreen_state.c
@@ -3322,7 +3322,7 @@ static void evergreen_dma_copy_tile(struct r600_context *rctx,
}
}
-static void evergreen_dma_blit(struct pipe_context *ctx,
+static void evergreen_dma_copy(struct pipe_context *ctx,
struct pipe_resource *dst,
unsigned dst_level,
unsigned dstx, unsigned dsty, unsigned dstz,
@@ -3343,7 +3343,7 @@ static void evergreen_dma_blit(struct pipe_context *ctx,
}
if (dst->target == PIPE_BUFFER && src->target == PIPE_BUFFER) {
- evergreen_dma_copy(rctx, dst, src, dst_x, src_box->x, src_box->width);
+ evergreen_dma_copy_buffer(rctx, dst, src, dst_x, src_box->x, src_box->width);
return;
}
@@ -3409,7 +3409,7 @@ static void evergreen_dma_blit(struct pipe_context *ctx,
dst_offset = rdst->surface.level[dst_level].offset;
dst_offset += rdst->surface.level[dst_level].slice_size * dst_z;
dst_offset += dst_y * dst_pitch + dst_x * bpp;
- evergreen_dma_copy(rctx, dst, src, dst_offset, src_offset,
+ evergreen_dma_copy_buffer(rctx, dst, src, dst_offset, src_offset,
src_box->height * src_pitch);
} else {
evergreen_dma_copy_tile(rctx, dst, dst_level, dst_x, dst_y, dst_z,
@@ -3506,7 +3506,7 @@ void evergreen_init_state_functions(struct r600_context *rctx)
rctx->b.b.get_sample_position = evergreen_get_sample_position;
else
rctx->b.b.get_sample_position = cayman_get_sample_position;
- rctx->b.dma_copy = evergreen_dma_blit;
+ rctx->b.dma_copy = evergreen_dma_copy;
evergreen_init_compute_state_functions(rctx);
}
diff --git a/src/gallium/drivers/r600/r600_hw_context.c b/src/gallium/drivers/r600/r600_hw_context.c
index 69690df..4cb7739 100644
--- a/src/gallium/drivers/r600/r600_hw_context.c
+++ b/src/gallium/drivers/r600/r600_hw_context.c
@@ -450,12 +450,12 @@ void r600_need_dma_space(struct r600_context *ctx, unsigned num_dw)
}
}
-void r600_dma_copy(struct r600_context *rctx,
- struct pipe_resource *dst,
- struct pipe_resource *src,
- uint64_t dst_offset,
- uint64_t src_offset,
- uint64_t size)
+void r600_dma_copy_buffer(struct r600_context *rctx,
+ struct pipe_resource *dst,
+ struct pipe_resource *src,
+ uint64_t dst_offset,
+ uint64_t src_offset,
+ uint64_t size)
{
struct radeon_winsys_cs *cs = rctx->b.rings.dma.cs;
unsigned i, ncopy, csize;
diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h
index a3827e3..49f9ac8 100644
--- a/src/gallium/drivers/r600/r600_pipe.h
+++ b/src/gallium/drivers/r600/r600_pipe.h
@@ -594,22 +594,22 @@ void r600_cp_dma_copy_buffer(struct r600_context *rctx,
void evergreen_cp_dma_clear_buffer(struct r600_context *rctx,
struct pipe_resource *dst, uint64_t offset,
unsigned size, uint32_t clear_value);
-void r600_dma_copy(struct r600_context *rctx,
- struct pipe_resource *dst,
- struct pipe_resource *src,
- uint64_t dst_offset,
- uint64_t src_offset,
- uint64_t size);
+void r600_dma_copy_buffer(struct r600_context *rctx,
+ struct pipe_resource *dst,
+ struct pipe_resource *src,
+ uint64_t dst_offset,
+ uint64_t src_offset,
+ uint64_t size);
/*
* evergreen_hw_context.c
*/
-void evergreen_dma_copy(struct r600_context *rctx,
- struct pipe_resource *dst,
- struct pipe_resource *src,
- uint64_t dst_offset,
- uint64_t src_offset,
- uint64_t size);
+void evergreen_dma_copy_buffer(struct r600_context *rctx,
+ struct pipe_resource *dst,
+ struct pipe_resource *src,
+ uint64_t dst_offset,
+ uint64_t src_offset,
+ uint64_t size);
/* r600_state_common.c */
void r600_init_common_state_functions(struct r600_context *rctx);
diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c
index 44a814c..4d2b2a3 100644
--- a/src/gallium/drivers/r600/r600_state.c
+++ b/src/gallium/drivers/r600/r600_state.c
@@ -2879,7 +2879,7 @@ static boolean r600_dma_copy_tile(struct r600_context *rctx,
return TRUE;
}
-static void r600_dma_blit(struct pipe_context *ctx,
+static void r600_dma_copy(struct pipe_context *ctx,
struct pipe_resource *dst,
unsigned dst_level,
unsigned dstx, unsigned dsty, unsigned dstz,
@@ -2903,7 +2903,7 @@ static void r600_dma_blit(struct pipe_context *ctx,
if (dst_x % 4 || src_box->x % 4 || src_box->width % 4)
goto fallback;
- r600_dma_copy(rctx, dst, src, dst_x, src_box->x, src_box->width);
+ r600_dma_copy_buffer(rctx, dst, src, dst_x, src_box->x, src_box->width);
return;
}
@@ -2957,7 +2957,7 @@ static void r600_dma_blit(struct pipe_context *ctx,
if (dst_offset % 4 || src_offset % 4 || size % 4) {
goto fallback;
}
- r600_dma_copy(rctx, dst, src, dst_offset, src_offset, size);
+ r600_dma_copy_buffer(rctx, dst, src, dst_offset, src_offset, size);
} else {
if (!r600_dma_copy_tile(rctx, dst, dst_level, dst_x, dst_y, dst_z,
src, src_level, src_x, src_y, src_box->z,
@@ -3050,6 +3050,6 @@ void r600_init_state_functions(struct r600_context *rctx)
rctx->b.b.set_polygon_stipple = r600_set_polygon_stipple;
rctx->b.b.set_scissor_states = r600_set_scissor_states;
rctx->b.b.get_sample_position = r600_get_sample_position;
- rctx->b.dma_copy = r600_dma_blit;
+ rctx->b.dma_copy = r600_dma_copy;
}
/* this function must be last */
--
1.8.3.2
More information about the mesa-dev
mailing list