From 3a63355583bc332fb85b40752f503ec4ba87643f Mon Sep 17 00:00:00 2001 From: David Rosca Date: Thu, 16 Oct 2025 14:39:46 +0200 Subject: [PATCH] radv/video: Don't require encode FW version >= interface version Otherwise this breaks backwards compatibility when bumping interface version for new features. Cc: mesa-stable Reviewed-by: Benjamin Cheng (cherry picked from commit 96db490318f0852aaf01b1f23a4a82a8574f4126) Part-of: --- .pick_status.json | 2 +- src/amd/vulkan/radv_video_enc.c | 25 ------------------------- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 7eaa4c32934..458347247a7 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1534,7 +1534,7 @@ "description": "radv/video: Don't require encode FW version >= interface version", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/amd/vulkan/radv_video_enc.c b/src/amd/vulkan/radv_video_enc.c index 54b74beaf24..f6aac07e993 100644 --- a/src/amd/vulkan/radv_video_enc.c +++ b/src/amd/vulkan/radv_video_enc.c @@ -67,31 +67,6 @@ radv_probe_video_encode(struct radv_physical_device *pdev) if (instance->debug_flags & RADV_DEBUG_NO_VIDEO) return; - if (pdev->info.vcn_ip_version >= VCN_5_0_0) { - pdev->video_encode_enabled = true; - return; - } else if (pdev->info.vcn_ip_version >= VCN_4_0_0) { - if (pdev->info.vcn_enc_major_version != RENCODE_V4_FW_INTERFACE_MAJOR_VERSION) - return; - if (pdev->info.vcn_enc_minor_version < RENCODE_V4_FW_INTERFACE_MINOR_VERSION) - return; - } else if (pdev->info.vcn_ip_version >= VCN_3_0_0) { - if (pdev->info.vcn_enc_major_version != RENCODE_V3_FW_INTERFACE_MAJOR_VERSION) - return; - if (pdev->info.vcn_enc_minor_version < RENCODE_V3_FW_INTERFACE_MINOR_VERSION) - return; - } else if (pdev->info.vcn_ip_version >= VCN_2_0_0) { - if (pdev->info.vcn_enc_major_version != RENCODE_V2_FW_INTERFACE_MAJOR_VERSION) - return; - if (pdev->info.vcn_enc_minor_version < RENCODE_V2_FW_INTERFACE_MINOR_VERSION) - return; - } else { - if (pdev->info.vcn_enc_major_version != RENCODE_FW_INTERFACE_MAJOR_VERSION) - return; - if (pdev->info.vcn_enc_minor_version < RENCODE_FW_INTERFACE_MINOR_VERSION) - return; - } - /* WRITE_MEMORY is needed for SetEvent and is required to pass CTS */ if (radv_video_write_memory_supported(pdev)) { pdev->video_encode_enabled = true;