From f87759d537a59a5c5d3d0d80b4b79bce0344143e Mon Sep 17 00:00:00 2001 From: David Rosca Date: Fri, 11 Apr 2025 12:38:38 +0200 Subject: [PATCH] radeonsi/video: Remove cs argument from si_video_resize_buffer Not needed anymore. Reviewed-by: Ruijing Dong Part-of: --- src/gallium/drivers/radeonsi/radeon_uvd.c | 2 +- src/gallium/drivers/radeonsi/radeon_uvd_enc.c | 2 +- src/gallium/drivers/radeonsi/radeon_vce.c | 2 +- src/gallium/drivers/radeonsi/radeon_vcn_dec.c | 4 ++-- src/gallium/drivers/radeonsi/radeon_vcn_enc.c | 4 ++-- src/gallium/drivers/radeonsi/radeon_video.c | 6 +++--- src/gallium/drivers/radeonsi/radeon_video.h | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/gallium/drivers/radeonsi/radeon_uvd.c b/src/gallium/drivers/radeonsi/radeon_uvd.c index 92b9264d975..75e3ef7bb02 100644 --- a/src/gallium/drivers/radeonsi/radeon_uvd.c +++ b/src/gallium/drivers/radeonsi/radeon_uvd.c @@ -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; } diff --git a/src/gallium/drivers/radeonsi/radeon_uvd_enc.c b/src/gallium/drivers/radeonsi/radeon_uvd_enc.c index 455811c4038..3c5b5407e13 100644 --- a/src/gallium/drivers/radeonsi/radeon_uvd_enc.c +++ b/src/gallium/drivers/radeonsi/radeon_uvd_enc.c @@ -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; } diff --git a/src/gallium/drivers/radeonsi/radeon_vce.c b/src/gallium/drivers/radeonsi/radeon_vce.c index f958fe6b6ef..ff43a780c52 100644 --- a/src/gallium/drivers/radeonsi/radeon_vce.c +++ b/src/gallium/drivers/radeonsi/radeon_vce.c @@ -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; } diff --git a/src/gallium/drivers/radeonsi/radeon_vcn_dec.c b/src/gallium/drivers/radeonsi/radeon_vcn_dec.c index 38fecc666f8..a11753f1083 100644 --- a/src/gallium/drivers/radeonsi/radeon_vcn_dec.c +++ b/src/gallium/drivers/radeonsi/radeon_vcn_dec.c @@ -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; } diff --git a/src/gallium/drivers/radeonsi/radeon_vcn_enc.c b/src/gallium/drivers/radeonsi/radeon_vcn_enc.c index b0fe587c1dc..c0b203eec06 100644 --- a/src/gallium/drivers/radeonsi/radeon_vcn_enc.c +++ b/src/gallium/drivers/radeonsi/radeon_vcn_enc.c @@ -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; } diff --git a/src/gallium/drivers/radeonsi/radeon_video.c b/src/gallium/drivers/radeonsi/radeon_video.c index f985b364fdc..1952897cb84 100644 --- a/src/gallium/drivers/radeonsi/radeon_video.c +++ b/src/gallium/drivers/radeonsi/radeon_video.c @@ -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; diff --git a/src/gallium/drivers/radeonsi/radeon_video.h b/src/gallium/drivers/radeonsi/radeon_video.h index dd11efe6175..4093ae58baa 100644 --- a/src/gallium/drivers/radeonsi/radeon_video.h +++ b/src/gallium/drivers/radeonsi/radeon_video.h @@ -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);