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

radeonsi/vcn: apply update_decoder_target logic

Browse source 
implement update_decoder_target and
remove corresponding obsolete logic.

Cc: mesa-stable
Reviewed-by: Boyuan Zhang <Boyuan.Zhang@amd.com>
Signed-off-by: Ruijing Dong <ruijing.dong@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23061>
(cherry picked from commit a89f740e28)
This commit is contained in:
Ruijing Dong 2023-05-23 09:52:40 -04:00 • committed by Eric Engestrom
parent 9d4bc470cd
commit 744d5524eb
2 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1237,7 +1237,7 @@
"description": "radeonsi/vcn: apply update_decoder_target logic",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

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

@ -92,7 +92,6 @@ static rvcn_dec_message_avc_t get_h264_msg(struct radeon_decoder *dec,
struct pipe_h264_picture_desc *pic)
{
rvcn_dec_message_avc_t result;
struct h264_private *private;
unsigned i, j, k;
memset(&result, 0, sizeof(result));
@ -189,25 +188,6 @@ static rvcn_dec_message_avc_t get_h264_msg(struct radeon_decoder *dec,
goto end;
}
private = pic->priv;
for (i = 0; i < ARRAY_SIZE(private->past_ref); i++) {
for (k = 0; private->past_ref[i] && (k < ARRAY_SIZE(pic->ref)); k++)
if (pic->ref[k] && (private->past_ref[i] == pic->ref[k]))
break;
for (j = 0; private->past_ref[i]
&& (k == ARRAY_SIZE(pic->ref))
&& (j < ARRAY_SIZE(dec->render_pic_list)); j++) {
if (dec->render_pic_list[j]
&& (dec->render_pic_list[j] == private->past_ref[i])) {
dec->render_pic_list[j] = pic->ref[i];
vl_video_buffer_set_associated_data(pic->ref[i], &dec->base,
(void *)(uintptr_t)j, &radeon_dec_destroy_associated_data);
break;
}
}
}
for (i = 0; i < ARRAY_SIZE(dec->render_pic_list); i++) {
for (j = 0; (pic->ref[j] != NULL) && (j < ARRAY_SIZE(dec->render_pic_list)); j++) {
if (dec->render_pic_list[i] == pic->ref[j])
@ -3000,6 +2980,26 @@ static int radeon_dec_get_decoder_fence(struct pipe_video_codec *decoder,
return dec->ws->fence_wait(dec->ws, fence, timeout);
}
/**
* update render list when target buffer got updated, use the existing
* index and update the new buffer to associate with it.
*/
static void radeon_dec_update_render_list(struct pipe_video_codec *decoder,
struct pipe_video_buffer *old,
struct pipe_video_buffer *updated)
{
struct radeon_decoder *dec = (struct radeon_decoder *)decoder;
void *index = vl_video_buffer_get_associated_data(old, decoder);
vl_video_buffer_set_associated_data(updated, decoder, index,
old->destroy_associated_data);
for (int i = 0; i < ARRAY_SIZE(dec->render_pic_list); ++i) {
if (dec->render_pic_list[i] == old) {
dec->render_pic_list[i] = updated;
break;
}
}
}
/**
* create and HW decoder
*/
@ -3068,6 +3068,7 @@ struct pipe_video_codec *radeon_create_decoder(struct pipe_context *context,
dec->base.end_frame = radeon_dec_end_frame;
dec->base.flush = radeon_dec_flush;
dec->base.get_decoder_fence = radeon_dec_get_decoder_fence;
dec->base.update_decoder_target = radeon_dec_update_render_list;
dec->stream_type = stream_type;
dec->stream_handle = si_vid_alloc_stream_handle();