projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
radeonsi: rename rsrc -> ssrc, rdst -> sdst
[mesa.git]
/
src
/
gallium
/
drivers
/
radeonsi
/
cik_sdma.c
diff --git
a/src/gallium/drivers/radeonsi/cik_sdma.c
b/src/gallium/drivers/radeonsi/cik_sdma.c
index 8bf6b30aec755f68bae50ec354f6867b6606b415..096f75e508f243a0aa2e37a1e1f4c10e56dcb9a2 100644
(file)
--- a/
src/gallium/drivers/radeonsi/cik_sdma.c
+++ b/
src/gallium/drivers/radeonsi/cik_sdma.c
@@
-35,20
+35,20
@@
static void cik_sdma_copy_buffer(struct si_context *ctx,
{
struct radeon_cmdbuf *cs = ctx->dma_cs;
unsigned i, ncopy, csize;
{
struct radeon_cmdbuf *cs = ctx->dma_cs;
unsigned i, ncopy, csize;
- struct si_resource *
r
dst = si_resource(dst);
- struct si_resource *
r
src = si_resource(src);
+ struct si_resource *
s
dst = si_resource(dst);
+ struct si_resource *
s
src = si_resource(src);
/* Mark the buffer range of destination as valid (initialized),
* so that transfer_map knows it should wait for the GPU when mapping
* that range. */
/* Mark the buffer range of destination as valid (initialized),
* so that transfer_map knows it should wait for the GPU when mapping
* that range. */
- util_range_add(&
r
dst->valid_buffer_range, dst_offset,
+ util_range_add(&
s
dst->valid_buffer_range, dst_offset,
dst_offset + size);
dst_offset + size);
- dst_offset +=
r
dst->gpu_address;
- src_offset +=
r
src->gpu_address;
+ dst_offset +=
s
dst->gpu_address;
+ src_offset +=
s
src->gpu_address;
ncopy = DIV_ROUND_UP(size, CIK_SDMA_COPY_MAX_SIZE);
ncopy = DIV_ROUND_UP(size, CIK_SDMA_COPY_MAX_SIZE);
- si_need_dma_space(ctx, ncopy * 7,
rdst, r
src);
+ si_need_dma_space(ctx, ncopy * 7,
sdst, s
src);
for (i = 0; i < ncopy; i++) {
csize = MIN2(size, CIK_SDMA_COPY_MAX_SIZE);
for (i = 0; i < ncopy; i++) {
csize = MIN2(size, CIK_SDMA_COPY_MAX_SIZE);