drm/amdgpu: add PSP IP v14.0.4 support

This patch is to add PSP 14.0.4 support.

Signed-off-by: Tim Huang <Tim.Huang@amd.com>
Reviewed-by: Yifan Zhang <yifan1.zhang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@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 e15814d9ca17b3ab13497bf32845c43fa0576653..800cc7a148b20054d58fbc1223bd62c489e20e0d 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -219,6 +219,7 @@ static int psp_early_init(void *handle)
        case IP_VERSION(13, 0, 11):
        case IP_VERSION(14, 0, 0):
        case IP_VERSION(14, 0, 1):
+       case IP_VERSION(14, 0, 4):
                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 b52e15e2dcc7dc375c6b1014ce52512bcf88df7c..407477b895d1d4e2e54c9773c9d129798fde8b28 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c
@@ -106,6 +106,7 @@ static int psp_v13_0_init_microcode(struct psp_context *psp)
        case IP_VERSION(13, 0, 11):
        case IP_VERSION(14, 0, 0):
        case IP_VERSION(14, 0, 1):
+       case IP_VERSION(14, 0, 4):
                err = psp_init_toc_microcode(psp, ucode_prefix);
                if (err)
                        return err;