From c03805e4f57301b7e625e2a7bef7137994798088 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Wed, 18 Dec 2024 16:54:13 +0100 Subject: [PATCH] radeonsi/vcn: Use local variable for destory fence Reviewed-by: Ruijing Dong Part-of: --- src/gallium/drivers/radeonsi/radeon_vcn_dec.c | 7 ++++--- src/gallium/drivers/radeonsi/radeon_vcn_dec.h | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/radeonsi/radeon_vcn_dec.c b/src/gallium/drivers/radeonsi/radeon_vcn_dec.c index 277ce4174c6..512037e5001 100644 --- a/src/gallium/drivers/radeonsi/radeon_vcn_dec.c +++ b/src/gallium/drivers/radeonsi/radeon_vcn_dec.c @@ -2342,12 +2342,13 @@ static void radeon_dec_destroy(struct pipe_video_codec *decoder) } if (dec->stream_type != RDECODE_CODEC_JPEG) { + struct pipe_fence_handle *fence = NULL; map_msg_fb_it_probs_buf(dec); rvcn_dec_message_destroy(dec); send_msg_buf(dec); - flush(dec, 0, &dec->destroy_fence); - dec->ws->fence_wait(dec->ws, dec->destroy_fence, PIPE_DEFAULT_DECODER_FEEDBACK_TIMEOUT_NS); - dec->ws->fence_reference(dec->ws, &dec->destroy_fence, NULL); + flush(dec, 0, &fence); + dec->ws->fence_wait(dec->ws, fence, PIPE_DEFAULT_DECODER_FEEDBACK_TIMEOUT_NS); + dec->ws->fence_reference(dec->ws, &fence, NULL); } dec->ws->cs_destroy(&dec->cs); diff --git a/src/gallium/drivers/radeonsi/radeon_vcn_dec.h b/src/gallium/drivers/radeonsi/radeon_vcn_dec.h index e8217a5b3cb..23b186c3a5e 100644 --- a/src/gallium/drivers/radeonsi/radeon_vcn_dec.h +++ b/src/gallium/drivers/radeonsi/radeon_vcn_dec.h @@ -142,7 +142,6 @@ struct radeon_decoder { struct radeon_winsys_ctx **jctx; unsigned cb_idx; unsigned njctx; - struct pipe_fence_handle *destroy_fence; bool error;