drm/amdgpu: add PSP 14.0.1 support

This patch to add PSP 14.0.1 support.

Signed-off-by: Yifan Zhang <yifan1.zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index f0f01eac534a28c3dc8d03db4dfed44d7a0f6411..3c2b1413058bb790c3aa3da792934200a967ec29 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -216,6 +216,7 @@ static int psp_early_init(void *handle)
        case IP_VERSION(13, 0, 8):
        case IP_VERSION(13, 0, 11):
        case IP_VERSION(14, 0, 0):
+       case IP_VERSION(14, 0, 1):
                psp_v13_0_set_psp_funcs(psp);
                psp->boot_time_tmr = false;
                break;

diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c
index 0e4329640ecb63f254c9b0415ca0ade3d7f8f295..0da50ea46eafba015734db77c2e0c86f541ed2b8 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c
@@ -53,6 +53,8 @@ MODULE_FIRMWARE("amdgpu/psp_13_0_6_sos.bin");
 MODULE_FIRMWARE("amdgpu/psp_13_0_6_ta.bin");
 MODULE_FIRMWARE("amdgpu/psp_14_0_0_toc.bin");
 MODULE_FIRMWARE("amdgpu/psp_14_0_0_ta.bin");
+MODULE_FIRMWARE("amdgpu/psp_14_0_1_toc.bin");
+MODULE_FIRMWARE("amdgpu/psp_14_0_1_ta.bin");
 
 /* For large FW files the time to complete can be very long */
 #define USBC_PD_POLLING_LIMIT_S 240
@@ -101,6 +103,7 @@ static int psp_v13_0_init_microcode(struct psp_context *psp)
        case IP_VERSION(13, 0, 8):
        case IP_VERSION(13, 0, 11):
        case IP_VERSION(14, 0, 0):
+       case IP_VERSION(14, 0, 1):
                err = psp_init_toc_microcode(psp, ucode_prefix);
                if (err)
                        return err;