From c205817236db1407a5364b6fc979226b0521b873 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Thu, 20 Nov 2025 11:09:31 +0100 Subject: [PATCH] radeonsi/vcn: Fix maybe uninitialized warning Backport-to: 25.3 Reviewed-by: Benjamin Cheng (cherry picked from commit 1884b03a10e87d5bd0528593a2f0814a1f8f7711) Part-of: --- .pick_status.json | 2 +- src/gallium/drivers/radeonsi/radeon_vcn_enc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 0e08f857db8..eee7ad04ad9 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1624,7 +1624,7 @@ "description": "radeonsi/vcn: Fix maybe uninitialized warning", "nominated": true, "nomination_type": 4, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/drivers/radeonsi/radeon_vcn_enc.c b/src/gallium/drivers/radeonsi/radeon_vcn_enc.c index 69cd563f6ce..107a4d36d5d 100644 --- a/src/gallium/drivers/radeonsi/radeon_vcn_enc.c +++ b/src/gallium/drivers/radeonsi/radeon_vcn_enc.c @@ -1273,7 +1273,7 @@ static int setup_dpb(struct radeon_encoder *enc, uint32_t num_reconstructed_pict uint32_t aligned_width = align(enc->base.width, rec_alignment); uint32_t aligned_height = align(enc->base.height, rec_alignment); uint32_t pitch = align(aligned_width, enc->alignment); - uint32_t luma_size, chroma_size, pre_luma_size, pre_chroma_size, offset; + uint32_t luma_size, chroma_size, pre_luma_size = 0, pre_chroma_size = 0, offset; struct radeon_enc_pic *enc_pic = &enc->enc_pic; int i; bool has_b = enc_pic->spec_misc.b_picture_enabled; /* for h264 only */