fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 05:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

radeonsi/video: Remove cs argument from si_video_resize_buffer

Browse source 
Not needed anymore.

Reviewed-by: Ruijing Dong <ruijing.dong@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34477>
This commit is contained in:
David Rosca 2025-04-11 12:38:38 +02:00 • committed by Marge Bot
parent 996dbe0ba3
commit f87759d537
7 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/drivers/radeonsi/radeon_uvd.c
View file

@ -1045,7 +1045,7 @@ static void ruvd_decode_bitstream(struct pipe_video_codec *decoder,
return;
}
si_vid_destroy_buffer(&old_buf);
} else if (!si_vid_resize_buffer(dec->base.context, &dec->cs, buf, total_bs_size, NULL)) {
} else if (!si_vid_resize_buffer(dec->base.context, buf, total_bs_size, NULL)) {
RVID_ERR("Can't resize bitstream buffer!");
return;
}

2
src/gallium/drivers/radeonsi/radeon_uvd_enc.c
View file

@ -161,7 +161,7 @@ static void radeon_uvd_enc_begin_frame(struct pipe_video_codec *encoder,
RVID_ERR("Can't create DPB buffer.\n");
return;
}
} else if (!si_vid_resize_buffer(enc->base.context, &enc->cs, &enc->dpb, dpb_size, NULL)) {
} else if (!si_vid_resize_buffer(enc->base.context, &enc->dpb, dpb_size, NULL)) {
RVID_ERR("Can't resize DPB buffer.\n");
return;
}

2
src/gallium/drivers/radeonsi/radeon_vce.c
View file

@ -157,7 +157,7 @@ static void rvce_begin_frame(struct pipe_video_codec *encoder, struct pipe_video
RVID_ERR("Can't create DPB buffer.\n");
return;
}
} else if (!si_vid_resize_buffer(enc->base.context, &enc->cs, &enc->dpb, dpb_size, NULL)) {
} else if (!si_vid_resize_buffer(enc->base.context, &enc->dpb, dpb_size, NULL)) {
RVID_ERR("Can't resize DPB buffer.\n");
return;
}

4
src/gallium/drivers/radeonsi/radeon_vcn_dec.c
View file

@ -1641,7 +1641,7 @@ static struct pb_buffer_lean *rvcn_dec_message_decode(struct radeon_decoder *dec
align(dec->base.height, dec->db_alignment) * 3 / 2);
dec->dpb_size = calc_dpb_size(dec);
r = si_vid_resize_buffer(dec->base.context, &dec->cs, &dec->dpb, dec->dpb_size, &buf_offset_info);
r = si_vid_resize_buffer(dec->base.context, &dec->dpb, dec->dpb_size, &buf_offset_info);
if (!r) {
RADEON_DEC_ERR("Can't resize dpb.\n");
return NULL;
@ -2488,7 +2488,7 @@ static void radeon_dec_decode_bitstream(struct pipe_video_codec *decoder,
return;
}
si_vid_destroy_buffer(&old_buf);
} else if (!si_vid_resize_buffer(dec->base.context, &dec->cs, buf, total_bs_size, NULL)) {
} else if (!si_vid_resize_buffer(dec->base.context, buf, total_bs_size, NULL)) {
RADEON_DEC_ERR("Can't resize bitstream buffer!");
return;
}

4
src/gallium/drivers/radeonsi/radeon_vcn_enc.c
View file

@ -1553,12 +1553,12 @@ static void radeon_enc_begin_frame(struct pipe_video_codec *encoder,
if (dpb_slots > enc->dpb_slots) {
setup_dpb(enc, dpb_slots);
if (!si_vid_resize_buffer(enc->base.context, &enc->cs, enc->dpb, enc->dpb_size, NULL)) {
if (!si_vid_resize_buffer(enc->base.context, enc->dpb, enc->dpb_size, NULL)) {
RADEON_ENC_ERR("Can't resize DPB buffer.\n");
goto error;
}
if (sscreen->info.vcn_ip_version >= VCN_5_0_0 && enc->metadata_size &&
!si_vid_resize_buffer(enc->base.context, &enc->cs, enc->meta, enc->metadata_size, NULL)) {
!si_vid_resize_buffer(enc->base.context, enc->meta, enc->metadata_size, NULL)) {
RADEON_ENC_ERR("Can't resize meta buffer.\n");
goto error;
}

6
src/gallium/drivers/radeonsi/radeon_video.c
View file

@ -64,7 +64,7 @@ void si_vid_destroy_buffer(struct rvid_buffer *buffer)
}
/* reallocate a buffer, preserving its content */
bool si_vid_resize_buffer(struct pipe_context *context, struct radeon_cmdbuf *cs,
bool si_vid_resize_buffer(struct pipe_context *context,
struct rvid_buffer *new_buf, unsigned new_size,
struct rvid_buf_offset_info *buf_ofst_info)
{
@ -79,11 +79,11 @@ bool si_vid_resize_buffer(struct pipe_context *context, struct radeon_cmdbuf *cs
goto error;
if (old_buf.usage == PIPE_USAGE_STAGING) {
src = ws->buffer_map(ws, old_buf.res->buf, cs, PIPE_MAP_READ | RADEON_MAP_TEMPORARY);
src = ws->buffer_map(ws, old_buf.res->buf, NULL, PIPE_MAP_READ | RADEON_MAP_TEMPORARY);
if (!src)
goto error;
dst = ws->buffer_map(ws, new_buf->res->buf, cs, PIPE_MAP_WRITE | RADEON_MAP_TEMPORARY);
dst = ws->buffer_map(ws, new_buf->res->buf, NULL, PIPE_MAP_WRITE | RADEON_MAP_TEMPORARY);
if (!dst)
goto error;

2
src/gallium/drivers/radeonsi/radeon_video.h
View file

@ -46,7 +46,7 @@ bool si_vid_create_tmz_buffer(struct pipe_screen *screen, struct rvid_buffer *bu
void si_vid_destroy_buffer(struct rvid_buffer *buffer);
/* reallocate a buffer, preserving its content */
bool si_vid_resize_buffer(struct pipe_context *context, struct radeon_cmdbuf *cs,
bool si_vid_resize_buffer(struct pipe_context *context,
struct rvid_buffer *new_buf, unsigned new_size,
struct rvid_buf_offset_info *buf_ofst_info);