drm/amdgpu: Set psp ip block and funcs for v15.0.8

Set psp ip block and funcs for MP0 15.0.8

Signed-off-by: Le Ma <le.ma@amd.com>
Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Likun Gao <Likun.Gao@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index 959136c163ffb2a18eb82af0989d21072fe1a306..b184e183c139846be44ea758ecec36432b53b8f5 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -2154,6 +2154,9 @@ static int amdgpu_discovery_set_psp_ip_blocks(struct amdgpu_device *adev)
        case IP_VERSION(14, 0, 5):
                amdgpu_device_ip_block_add(adev, &psp_v14_0_ip_block);
                break;
+       case IP_VERSION(15, 0, 8):
+               amdgpu_device_ip_block_add(adev, &psp_v15_0_8_ip_block);
+               break;
        default:
                dev_err(adev->dev,
                        "Failed to add psp ip block(MP0_HWIP:0x%x)\n",

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index 2e158876bc94884259e6f39dcb8b1b43b70d1bbd..b80d1fab7389b7f68b64bd85d5bc87b935abad4e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -39,6 +39,7 @@
 #include "psp_v13_0.h"
 #include "psp_v13_0_4.h"
 #include "psp_v14_0.h"
+#include "psp_v15_0_8.h"
 
 #include "amdgpu_ras.h"
 #include "amdgpu_securedisplay.h"
@@ -259,6 +260,9 @@ static int psp_early_init(struct amdgpu_ip_block *ip_block)
                psp_v14_0_set_psp_funcs(psp);
                psp->boot_time_tmr = false;
                break;
+       case IP_VERSION(15, 0, 8):
+               psp_v15_0_8_set_psp_funcs(psp);
+               break;
        default:
                return -EINVAL;
        }