KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

radeon: rename RADEON_TRANSFER_* -> RADEON_MAP_* 

Acked-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5749>
This commit is contained in:
Marek Olšák 2020-08-06 12:47:01 -04:00 committed by Marge Bot
parent 31765340fd
commit 8e1193b8d3
18 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/drivers/r600/evergreen_compute.c
View File

@ -458,7 +458,7 @@ static void *evergreen_create_compute_state(struct pipe_context *ctx,
shader->bc.ndw * 4);
p = r600_buffer_map_sync_with_rings(
&rctx->b, shader->code_bo,
PIPE_MAP_WRITE | RADEON_TRANSFER_TEMPORARY);
PIPE_MAP_WRITE | RADEON_MAP_TEMPORARY);
//TODO: use util_memcpy_cpu_to_le32 ?
memcpy(p, shader->bc.bytecode, shader->bc.ndw * 4);
rctx->b.ws->buffer_unmap(shader->code_bo->buf);

2
src/gallium/drivers/r600/r600_asm.c
View File

@ -2776,7 +2776,7 @@ void *r600_create_vertex_fetch_shader(struct pipe_context *ctx,
bytecode = r600_buffer_map_sync_with_rings
(&rctx->b, shader->buffer,
PIPE_MAP_WRITE | PIPE_MAP_UNSYNCHRONIZED | RADEON_TRANSFER_TEMPORARY);
PIPE_MAP_WRITE | PIPE_MAP_UNSYNCHRONIZED | RADEON_MAP_TEMPORARY);
bytecode += shader->offset / 4;
if (R600_BIG_ENDIAN) {

2
src/gallium/drivers/r600/r600_shader.c
View File

@ -149,7 +149,7 @@ static int store_shader(struct pipe_context *ctx,
}
ptr = r600_buffer_map_sync_with_rings(
&rctx->b, shader->bo,
PIPE_MAP_WRITE | RADEON_TRANSFER_TEMPORARY);
PIPE_MAP_WRITE | RADEON_MAP_TEMPORARY);
if (R600_BIG_ENDIAN) {
for (i = 0; i < shader->shader.bc.ndw; ++i) {
ptr[i] = util_cpu_to_le32(shader->shader.bc.bytecode[i]);

6
src/gallium/drivers/r600/radeon_uvd.c
View File

@ -153,7 +153,7 @@ static void map_msg_fb_it_buf(struct ruvd_decoder *dec)
/* and map it for CPU access */
ptr = dec->ws->buffer_map(buf->res->buf, dec->cs,
PIPE_MAP_WRITE | RADEON_TRANSFER_TEMPORARY);
PIPE_MAP_WRITE | RADEON_MAP_TEMPORARY);
/* calc buffer offsets */
dec->msg = (struct ruvd_msg *)ptr;
@ -842,7 +842,7 @@ static void ruvd_begin_frame(struct pipe_video_codec *decoder,
dec->bs_size = 0;
dec->bs_ptr = dec->ws->buffer_map(
dec->bs_buffers[dec->cur_buffer].res->buf,
dec->cs, PIPE_MAP_WRITE | RADEON_TRANSFER_TEMPORARY);
dec->cs, PIPE_MAP_WRITE | RADEON_MAP_TEMPORARY);
}
/**
@ -897,7 +897,7 @@ static void ruvd_decode_bitstream(struct pipe_video_codec *decoder,
dec->bs_ptr = dec->ws->buffer_map(buf->res->buf, dec->cs,
PIPE_MAP_WRITE |
RADEON_TRANSFER_TEMPORARY);
RADEON_MAP_TEMPORARY);
if (!dec->bs_ptr)
return;

2
src/gallium/drivers/r600/radeon_vce.c
View File

@ -359,7 +359,7 @@ static void rvce_get_feedback(struct pipe_video_codec *encoder,
if (size) {
uint32_t *ptr = enc->ws->buffer_map(
fb->res->buf, enc->cs,
PIPE_MAP_READ_WRITE | RADEON_TRANSFER_TEMPORARY);
PIPE_MAP_READ_WRITE | RADEON_MAP_TEMPORARY);
if (ptr[1]) {
*size = ptr[4] - ptr[9];

4
src/gallium/drivers/r600/radeon_video.c
View File

@ -98,12 +98,12 @@ bool rvid_resize_buffer(struct pipe_screen *screen, struct radeon_cmdbuf *cs,
goto error;
src = ws->buffer_map(old_buf.res->buf, cs,
PIPE_MAP_READ | RADEON_TRANSFER_TEMPORARY);
PIPE_MAP_READ | RADEON_MAP_TEMPORARY);
if (!src)
goto error;
dst = ws->buffer_map(new_buf->res->buf, cs,
PIPE_MAP_WRITE | RADEON_TRANSFER_TEMPORARY);
PIPE_MAP_WRITE | RADEON_MAP_TEMPORARY);
if (!dst)
goto error;

6
src/gallium/drivers/radeon/radeon_uvd.c
View File

@ -144,7 +144,7 @@ static void map_msg_fb_it_buf(struct ruvd_decoder *dec)
/* and map it for CPU access */
ptr =
dec->ws->buffer_map(buf->res->buf, dec->cs, PIPE_MAP_WRITE | RADEON_TRANSFER_TEMPORARY);
dec->ws->buffer_map(buf->res->buf, dec->cs, PIPE_MAP_WRITE | RADEON_MAP_TEMPORARY);
/* calc buffer offsets */
dec->msg = (struct ruvd_msg *)ptr;
@ -1014,7 +1014,7 @@ static void ruvd_begin_frame(struct pipe_video_codec *decoder, struct pipe_video
dec->bs_size = 0;
dec->bs_ptr = dec->ws->buffer_map(dec->bs_buffers[dec->cur_buffer].res->buf, dec->cs,
PIPE_MAP_WRITE | RADEON_TRANSFER_TEMPORARY);
PIPE_MAP_WRITE | RADEON_MAP_TEMPORARY);
}
/**
@ -1058,7 +1058,7 @@ static void ruvd_decode_bitstream(struct pipe_video_codec *decoder,
}
dec->bs_ptr = dec->ws->buffer_map(buf->res->buf, dec->cs,
PIPE_MAP_WRITE | RADEON_TRANSFER_TEMPORARY);
PIPE_MAP_WRITE | RADEON_MAP_TEMPORARY);
if (!dec->bs_ptr)
return;

2
src/gallium/drivers/radeon/radeon_uvd_enc.c
View File

@ -247,7 +247,7 @@ static void radeon_uvd_enc_get_feedback(struct pipe_video_codec *encoder, void *
if (NULL != size) {
radeon_uvd_enc_feedback_t *fb_data = (radeon_uvd_enc_feedback_t *)enc->ws->buffer_map(
fb->res->buf, enc->cs, PIPE_MAP_READ_WRITE | RADEON_TRANSFER_TEMPORARY);
fb->res->buf, enc->cs, PIPE_MAP_READ_WRITE | RADEON_MAP_TEMPORARY);
if (!fb_data->status)
*size = fb_data->bitstream_size;

2
src/gallium/drivers/radeon/radeon_vce.c
View File

@ -346,7 +346,7 @@ static void rvce_get_feedback(struct pipe_video_codec *encoder, void *feedback,
if (size) {
uint32_t *ptr = enc->ws->buffer_map(fb->res->buf, enc->cs,
PIPE_MAP_READ_WRITE | RADEON_TRANSFER_TEMPORARY);
PIPE_MAP_READ_WRITE | RADEON_MAP_TEMPORARY);
if (ptr[1]) {
*size = ptr[4] - ptr[9];

10
src/gallium/drivers/radeon/radeon_vcn_dec.c
View File

@ -961,7 +961,7 @@ static struct pb_buffer *rvcn_dec_message_decode(struct radeon_decoder *dec,
/* ctx needs probs table */
ptr = dec->ws->buffer_map(dec->ctx.res->buf, dec->cs,
PIPE_MAP_WRITE | RADEON_TRANSFER_TEMPORARY);
PIPE_MAP_WRITE | RADEON_MAP_TEMPORARY);
fill_probs_table(ptr);
dec->ws->buffer_unmap(dec->ctx.res->buf);
dec->bs_ptr = NULL;
@ -1052,7 +1052,7 @@ static void map_msg_fb_it_probs_buf(struct radeon_decoder *dec)
/* and map it for CPU access */
ptr =
dec->ws->buffer_map(buf->res->buf, dec->cs, PIPE_MAP_WRITE | RADEON_TRANSFER_TEMPORARY);
dec->ws->buffer_map(buf->res->buf, dec->cs, PIPE_MAP_WRITE | RADEON_MAP_TEMPORARY);
/* calc buffer offsets */
dec->msg = ptr;
@ -1331,7 +1331,7 @@ static void radeon_dec_begin_frame(struct pipe_video_codec *decoder,
dec->bs_size = 0;
dec->bs_ptr = dec->ws->buffer_map(dec->bs_buffers[dec->cur_buffer].res->buf, dec->cs,
PIPE_MAP_WRITE | RADEON_TRANSFER_TEMPORARY);
PIPE_MAP_WRITE | RADEON_MAP_TEMPORARY);
}
/**
@ -1376,7 +1376,7 @@ static void radeon_dec_decode_bitstream(struct pipe_video_codec *decoder,
}
dec->bs_ptr = dec->ws->buffer_map(buf->res->buf, dec->cs,
PIPE_MAP_WRITE | RADEON_TRANSFER_TEMPORARY);
PIPE_MAP_WRITE | RADEON_MAP_TEMPORARY);
if (!dec->bs_ptr)
return;
@ -1559,7 +1559,7 @@ struct pipe_video_codec *radeon_create_decoder(struct pipe_context *context,
buf = &dec->msg_fb_it_probs_buffers[i];
ptr = dec->ws->buffer_map(buf->res->buf, dec->cs,
PIPE_MAP_WRITE | RADEON_TRANSFER_TEMPORARY);
PIPE_MAP_WRITE | RADEON_MAP_TEMPORARY);
ptr += FB_BUFFER_OFFSET + FB_BUFFER_SIZE;
fill_probs_table(ptr);
dec->ws->buffer_unmap(buf->res->buf);

2
src/gallium/drivers/radeon/radeon_vcn_enc.c
View File

@ -363,7 +363,7 @@ static void radeon_enc_get_feedback(struct pipe_video_codec *encoder, void *feed
if (size) {
uint32_t *ptr = enc->ws->buffer_map(fb->res->buf, enc->cs,
PIPE_MAP_READ_WRITE | RADEON_TRANSFER_TEMPORARY);
PIPE_MAP_READ_WRITE | RADEON_MAP_TEMPORARY);
if (ptr[1])
*size = ptr[6];
else

4
src/gallium/drivers/radeon/radeon_video.c
View File

@ -86,11 +86,11 @@ bool si_vid_resize_buffer(struct pipe_screen *screen, struct radeon_cmdbuf *cs,
if (!si_vid_create_buffer(screen, new_buf, new_size, new_buf->usage))
goto error;
src = ws->buffer_map(old_buf.res->buf, cs, PIPE_MAP_READ | RADEON_TRANSFER_TEMPORARY);
src = ws->buffer_map(old_buf.res->buf, cs, PIPE_MAP_READ | RADEON_MAP_TEMPORARY);
if (!src)
goto error;
dst = ws->buffer_map(new_buf->res->buf, cs, PIPE_MAP_WRITE | RADEON_TRANSFER_TEMPORARY);
dst = ws->buffer_map(new_buf->res->buf, cs, PIPE_MAP_WRITE | RADEON_MAP_TEMPORARY);
if (!dst)
goto error;

8
src/gallium/drivers/radeon/radeon_winsys.h
View File

@ -94,14 +94,14 @@ enum radeon_bo_usage
RADEON_USAGE_SYNCHRONIZED = 8
};
enum radeon_transfer_flags
enum radeon_map_flags
{
/* Indicates that the caller will unmap the buffer.
*
* Not unmapping buffers is an important performance optimization for
* OpenGL (avoids kernel overhead for frequently mapped buffers).
*/
RADEON_TRANSFER_TEMPORARY = (PIPE_MAP_DRV_PRV << 0),
RADEON_MAP_TEMPORARY = (PIPE_MAP_DRV_PRV << 0),
};
#define RADEON_SPARSE_PAGE_SIZE (64 * 1024)
@ -306,11 +306,11 @@ struct radeon_winsys {
* space.
*
* Callers are expected to unmap buffers again if and only if the
* RADEON_TRANSFER_TEMPORARY flag is set in \p usage.
* RADEON_MAP_TEMPORARY flag is set in \p usage.
*
* \param buf A winsys buffer object to map.
* \param cs A command stream to flush if the buffer is referenced by it.
* \param usage A bitmask of the PIPE_MAP_* and RADEON_TRANSFER_* flags.
* \param usage A bitmask of the PIPE_MAP_* and RADEON_MAP_* flags.
* \return The pointer at the beginning of the buffer.
*/
void *(*buffer_map)(struct pb_buffer *buf, struct radeon_cmdbuf *cs,

2
src/gallium/drivers/radeonsi/si_debug.c
View File

@ -109,7 +109,7 @@ static void si_dump_shader(struct si_screen *sscreen, struct si_shader *shader,
const char *mapped = sscreen->ws->buffer_map(
shader->bo->buf, NULL,
PIPE_MAP_UNSYNCHRONIZED | PIPE_MAP_READ | RADEON_TRANSFER_TEMPORARY);
PIPE_MAP_UNSYNCHRONIZED | PIPE_MAP_READ | RADEON_MAP_TEMPORARY);
for (unsigned i = 0; i < size; i += 4) {
fprintf(f, " %4x: %08x\n", i, *(uint32_t *)(mapped + i));

2
src/gallium/drivers/radeonsi/si_shader.c
View File

@ -899,7 +899,7 @@ bool si_shader_binary_upload(struct si_screen *sscreen, struct si_shader *shader
u.rx_va = shader->bo->gpu_address;
u.rx_ptr = sscreen->ws->buffer_map(
shader->bo->buf, NULL,
PIPE_MAP_READ_WRITE | PIPE_MAP_UNSYNCHRONIZED | RADEON_TRANSFER_TEMPORARY);
PIPE_MAP_READ_WRITE | PIPE_MAP_UNSYNCHRONIZED | RADEON_MAP_TEMPORARY);
if (!u.rx_ptr)
return false;

2
src/gallium/drivers/radeonsi/si_texture.c
View File

@ -1738,7 +1738,7 @@ static void *si_texture_transfer_map(struct pipe_context *ctx, struct pipe_resou
* we don't run out of the CPU address space.
*/
if (sizeof(void *) == 4)
usage |= RADEON_TRANSFER_TEMPORARY;
usage |= RADEON_MAP_TEMPORARY;
if (!(map = si_buffer_map_sync_with_rings(sctx, buf, usage)))
goto fail_trans;

4
src/gallium/winsys/amdgpu/drm/amdgpu_bo.c
View File

@ -370,7 +370,7 @@ void *amdgpu_bo_map(struct pb_buffer *buf,
offset = bo->va - real->va;
}
if (usage & RADEON_TRANSFER_TEMPORARY) {
if (usage & RADEON_MAP_TEMPORARY) {
if (real->is_user_ptr) {
cpu = real->cpu_ptr;
} else {
@ -412,7 +412,7 @@ void amdgpu_bo_unmap(struct pb_buffer *buf)
assert(real->u.real.map_count != 0 && "too many unmaps");
if (p_atomic_dec_zero(&real->u.real.map_count)) {
assert(!real->cpu_ptr &&
"too many unmaps or forgot RADEON_TRANSFER_TEMPORARY flag");
"too many unmaps or forgot RADEON_MAP_TEMPORARY flag");
if (real->initial_domain & RADEON_DOMAIN_VRAM)
real->ws->mapped_vram -= real->base.size;

2
src/gallium/winsys/amdgpu/drm/amdgpu_cs.c
View File

@ -1054,7 +1054,7 @@ amdgpu_cs_setup_preemption(struct radeon_cmdbuf *rcs, const uint32_t *preamble_i
return false;
map = (uint32_t*)amdgpu_bo_map(preamble_bo, NULL,
PIPE_MAP_WRITE | RADEON_TRANSFER_TEMPORARY);
PIPE_MAP_WRITE | RADEON_MAP_TEMPORARY);
if (!map) {
pb_reference(&preamble_bo, NULL);
return false;