radv/video: Fix AV1 bidir compound encode with order_hint disabled

Cc: mesa-stable
Reviewed-by: Benjamin Cheng <benjamin.cheng@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37911>
This commit is contained in:
David Rosca 2025-10-16 14:58:17 +02:00 committed by Marge Bot
parent 96db490318
commit bcb6e6b6e6

View file

@ -41,7 +41,7 @@
#define ENC_ALIGNMENT 256 #define ENC_ALIGNMENT 256
#define RENCODE_V5_FW_INTERFACE_MAJOR_VERSION 1 #define RENCODE_V5_FW_INTERFACE_MAJOR_VERSION 1
#define RENCODE_V5_FW_INTERFACE_MINOR_VERSION 3 #define RENCODE_V5_FW_INTERFACE_MINOR_VERSION 10
#define RENCODE_V4_FW_INTERFACE_MAJOR_VERSION 1 #define RENCODE_V4_FW_INTERFACE_MAJOR_VERSION 1
#define RENCODE_V4_FW_INTERFACE_MINOR_VERSION 11 #define RENCODE_V4_FW_INTERFACE_MINOR_VERSION 11
@ -470,10 +470,10 @@ radv_enc_session_init(struct radv_cmd_buffer *cmd_buffer, const struct VkVideoEn
if (pdev->enc_hw_ver >= RADV_VIDEO_ENC_HW_3) if (pdev->enc_hw_ver >= RADV_VIDEO_ENC_HW_3)
RADEON_ENC_CS(vid->enc_session.slice_output_enabled); RADEON_ENC_CS(vid->enc_session.slice_output_enabled);
RADEON_ENC_CS(vid->enc_session.display_remote); RADEON_ENC_CS(vid->enc_session.display_remote);
if (pdev->enc_hw_ver == RADV_VIDEO_ENC_HW_4) { if (pdev->enc_hw_ver == RADV_VIDEO_ENC_HW_4)
RADEON_ENC_CS(vid->enc_session.WA_flags); RADEON_ENC_CS(vid->enc_session.WA_flags);
if (pdev->enc_hw_ver >= RADV_VIDEO_ENC_HW_4)
RADEON_ENC_CS(0); RADEON_ENC_CS(0);
}
RADEON_ENC_END(); RADEON_ENC_END();
} }
@ -2247,6 +2247,7 @@ radv_enc_params_av1(struct radv_cmd_buffer *cmd_buffer, const VkVideoEncodeInfoK
RADEON_ENC_CS(av1_picture_info->referenceNameSlotIndices[i]); RADEON_ENC_CS(av1_picture_info->referenceNameSlotIndices[i]);
RADEON_ENC_CS(slot_idx_0); RADEON_ENC_CS(slot_idx_0);
RADEON_ENC_CS(slot_idx_1); RADEON_ENC_CS(slot_idx_1);
RADEON_ENC_CS(av1_picture_info->pStdPictureInfo->order_hint);
RADEON_ENC_END(); RADEON_ENC_END();
} }