drm/amdgpu: add VCN_4_0_2 firmware support
authorSonny Jiang <sonny.jiang@amd.com>
Thu, 21 Jul 2022 17:27:10 +0000 (13:27 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 28 Jul 2022 20:28:54 +0000 (16:28 -0400)
Add VCN_4_0_2 firmware support

Signed-off-by: Sonny Jiang <sonny.jiang@amd.com>
Reviewed-by: James Zhu <James.Zhu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c

index 1bfdfb9207acf273c26ff2ff6084531f15ee911f..f36e4f08db6d4d6110cbbf7585601c09e7627f2b 100644 (file)
@@ -54,6 +54,7 @@
 #define FIRMWARE_YELLOW_CARP   "amdgpu/yellow_carp_vcn.bin"
 #define FIRMWARE_VCN_3_1_2     "amdgpu/vcn_3_1_2.bin"
 #define FIRMWARE_VCN4_0_0      "amdgpu/vcn_4_0_0.bin"
+#define FIRMWARE_VCN4_0_2      "amdgpu/vcn_4_0_2.bin"
 #define FIRMWARE_VCN4_0_4      "amdgpu/vcn_4_0_4.bin"
 
 MODULE_FIRMWARE(FIRMWARE_RAVEN);
@@ -74,6 +75,7 @@ MODULE_FIRMWARE(FIRMWARE_BEIGE_GOBY);
 MODULE_FIRMWARE(FIRMWARE_YELLOW_CARP);
 MODULE_FIRMWARE(FIRMWARE_VCN_3_1_2);
 MODULE_FIRMWARE(FIRMWARE_VCN4_0_0);
+MODULE_FIRMWARE(FIRMWARE_VCN4_0_2);
 MODULE_FIRMWARE(FIRMWARE_VCN4_0_4);
 
 static void amdgpu_vcn_idle_work_handler(struct work_struct *work);
@@ -185,6 +187,12 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev)
                        (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG))
                        adev->vcn.indirect_sram = true;
                break;
+       case IP_VERSION(4, 0, 2):
+               fw_name = FIRMWARE_VCN4_0_2;
+               if ((adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) &&
+                       (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG))
+                       adev->vcn.indirect_sram = false;
+               break;
        case IP_VERSION(4, 0, 4):
                fw_name = FIRMWARE_VCN4_0_4;
                if ((adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) &&