OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv/video: use vcn ip versions for encoder detection.

Browse Source 
This aligned with radeonsi code.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29747>
This commit is contained in:
Dave Airlie
2024-05-14 13:10:41 +10:00
committed by Marge Bot
parent 08c4efdd8d
commit f1e27e156b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/amd/vulkan/radv_video_enc.c
View File

@@ -141,15 +141,15 @@ radv_probe_video_encode(struct radv_physical_device *pdev)
void
radv_init_physical_device_encoder(struct radv_physical_device *pdev)
{
if (pdev->info.family >= CHIP_NAVI31) {
if (pdev->info.vcn_ip_version >= VCN_4_0_0) {
pdev->enc_hw_ver = RADV_VIDEO_ENC_HW_4;
pdev->encoder_interface_version = ((RENCODE_V4_FW_INTERFACE_MAJOR_VERSION << RENCODE_IF_MAJOR_VERSION_SHIFT) |
(RENCODE_V4_FW_INTERFACE_MINOR_VERSION << RENCODE_IF_MINOR_VERSION_SHIFT));
} else if (pdev->info.family >= CHIP_NAVI21) {
} else if (pdev->info.vcn_ip_version >= VCN_3_0_0) {
pdev->enc_hw_ver = RADV_VIDEO_ENC_HW_3;
pdev->encoder_interface_version = ((RENCODE_V3_FW_INTERFACE_MAJOR_VERSION << RENCODE_IF_MAJOR_VERSION_SHIFT) |
(RENCODE_V3_FW_INTERFACE_MINOR_VERSION << RENCODE_IF_MINOR_VERSION_SHIFT));
} else if (pdev->info.family >= CHIP_RENOIR) {
} else if (pdev->info.vcn_ip_version >= VCN_2_0_0) {
pdev->enc_hw_ver = RADV_VIDEO_ENC_HW_2;
pdev->encoder_interface_version = ((RENCODE_V2_FW_INTERFACE_MAJOR_VERSION << RENCODE_IF_MAJOR_VERSION_SHIFT) |
(RENCODE_V2_FW_INTERFACE_MINOR_VERSION << RENCODE_IF_MINOR_VERSION_SHIFT));
@@ -159,7 +159,7 @@ radv_init_physical_device_encoder(struct radv_physical_device *pdev)
(RENCODE_FW_INTERFACE_MINOR_VERSION << RENCODE_IF_MINOR_VERSION_SHIFT));
}
if (pdev->info.family >= CHIP_RENOIR) {
if (pdev->info.vcn_ip_version >= VCN_2_0_0) {
pdev->vcn_enc_cmds.session_info = RENCODE_V2_IB_PARAM_SESSION_INFO;
pdev->vcn_enc_cmds.task_info = RENCODE_V2_IB_PARAM_TASK_INFO;
pdev->vcn_enc_cmds.session_init = RENCODE_V2_IB_PARAM_SESSION_INIT;