OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radeonsi/vcn: Fix leaking fences in decode

Browse Source 
Unref fence used in destroy.

Don't store the fence reference in picture->fence, instead
keep it in the driver. Because only the last fence will
now be valid, check the fence pointer in get_decoder_fence.

Reviewed-by: Leo Liu <leo.liu@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24677>
This commit is contained in:
David Rosca
2023-08-14 20:31:58 +02:00
committed by Marge Bot
parent 1198816f50
commit f638ba4669
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gallium/drivers/radeonsi/radeon_vcn_dec.c
View File

@@ -2740,8 +2740,10 @@ static void radeon_dec_destroy(struct pipe_video_codec *decoder)
send_msg_buf(dec); send_msg_buf(dec);
flush(dec, 0, &dec->destroy_fence); flush(dec, 0, &dec->destroy_fence);
dec->ws->fence_wait(dec->ws, dec->destroy_fence, PIPE_DEFAULT_DECODER_FEEDBACK_TIMEOUT_NS); dec->ws->fence_wait(dec->ws, dec->destroy_fence, PIPE_DEFAULT_DECODER_FEEDBACK_TIMEOUT_NS);
dec->ws->fence_reference(&dec->destroy_fence, NULL);
} }
dec->ws->fence_reference(&dec->prev_fence, NULL);
dec->ws->cs_destroy(&dec->cs); dec->ws->cs_destroy(&dec->cs);
if (dec->stream_type == RDECODE_CODEC_JPEG) { if (dec->stream_type == RDECODE_CODEC_JPEG) {
@@ -2919,9 +2921,9 @@ static void radeon_dec_end_frame(struct pipe_video_codec *decoder, struct pipe_v
return; return;
dec->send_cmd(dec, target, picture); dec->send_cmd(dec, target, picture);
flush(dec, PIPE_FLUSH_ASYNC, picture->fence); flush(dec, PIPE_FLUSH_ASYNC, &dec->prev_fence);
if (picture->fence) if (picture->fence)
dec->prev_fence = *picture->fence; *picture->fence = dec->prev_fence;
next_buffer(dec); next_buffer(dec);
} }
@@ -2965,6 +2967,9 @@ static int radeon_dec_get_decoder_fence(struct pipe_video_codec *decoder,
uint64_t timeout) { uint64_t timeout) {
struct radeon_decoder *dec = (struct radeon_decoder *)decoder; struct radeon_decoder *dec = (struct radeon_decoder *)decoder;
/* Only last fence is valid */
if (fence != dec->prev_fence)
return true;
return dec->ws->fence_wait(dec->ws, fence, timeout); return dec->ws->fence_wait(dec->ws, fence, timeout);
} }