From ee1132bd793d26f512d0eaab7a6fb198634968c5 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Wed, 23 Aug 2023 07:16:41 +0200 Subject: [PATCH] Revert "radeonsi/vcn: add an exception of field case for h264 decoding" This change causes page faults when playing corrupted video from the bugreport. The original issue have now been resolved in firmware. This reverts commit bfce57c7a5ba62d8e6f65addb2df136cab603a68. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/9210 Reviewed-by: Ruijing Dong Part-of: --- src/gallium/drivers/radeonsi/radeon_vcn_dec.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/gallium/drivers/radeonsi/radeon_vcn_dec.c b/src/gallium/drivers/radeonsi/radeon_vcn_dec.c index b7b5ffda5e9..5c14f394ab0 100644 --- a/src/gallium/drivers/radeonsi/radeon_vcn_dec.c +++ b/src/gallium/drivers/radeonsi/radeon_vcn_dec.c @@ -241,9 +241,7 @@ static rvcn_dec_message_avc_t get_h264_msg(struct radeon_decoder *dec, /* if reference picture exists, however no reference picture found at the end curr_pic_ref_frame_num == 0, which is not reasonable, should be corrected. */ - /* one exeption for I frames which is valid situation and should be skipped. */ - if ((result.curr_field_order_cnt_list[0] == result.curr_field_order_cnt_list[1]) - && result.used_for_reference_flags && (result.curr_pic_ref_frame_num == 0)) { + if (result.used_for_reference_flags && (result.curr_pic_ref_frame_num == 0)) { for (i = 0; i < ARRAY_SIZE(result.ref_frame_list); i++) { result.ref_frame_list[i] = pic->ref[i] ? (uintptr_t)vl_video_buffer_get_associated_data(pic->ref[i], &dec->base) : 0xff;