From 76e3004fef009f9e5dedefdc00d51c558c744a8c Mon Sep 17 00:00:00 2001 From: David Rosca Date: Sat, 30 Nov 2024 10:05:03 +0100 Subject: [PATCH] radv/video: Always use setup reference slot when valid Reviewed-by: Benjamin Cheng Cc: mesa-stable Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10977 Part-of: --- src/amd/vulkan/radv_video.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/amd/vulkan/radv_video.c b/src/amd/vulkan/radv_video.c index 5931d985021..cd42ba79191 100644 --- a/src/amd/vulkan/radv_video.c +++ b/src/amd/vulkan/radv_video.c @@ -1995,9 +1995,9 @@ rvcn_dec_message_decode(struct radv_cmd_buffer *cmd_buffer, struct radv_video_se *slice_offset = 0; /* Intra-only decoding will only work without a setup slot for AV1 - * currently, other codecs require the application to pass a + * (non-filmgrain) currently, other codecs require the application to pass a * setup slot for this use-case, since the FW is not able to skip write-out - * for H26X. In order to fix that properly, additional scratch space will + * for H26X. In order to fix that properly, additional scratch space will * be needed in the video session just for intra-only DPB targets. */ int dpb_update_required = 1; @@ -2037,10 +2037,10 @@ rvcn_dec_message_decode(struct radv_cmd_buffer *cmd_buffer, struct radv_video_se assert(frame_info->pSetupReferenceSlot != NULL); struct radv_image_view *dpb_iv = - dpb_update_required + frame_info->pSetupReferenceSlot ? radv_image_view_from_handle(frame_info->pSetupReferenceSlot->pPictureResource->imageViewBinding) : NULL; - struct radv_image *dpb = dpb_update_required ? dpb_iv->image : img; + struct radv_image *dpb = dpb_iv ? dpb_iv->image : img; int dpb_array_idx = 0; if (dpb_update_required) {