drm/amdgpu: add support for PSP version 15.0.9

Initialize PSP Version 15_0_9

Signed-off-by: Kanala Ramalingeswara Reddy <Kanala.RamalingeswaraReddy@amd.com>
Signed-off-by: Granthali Vinodkumar Dhandar <granthali.vinodkumardhandar@amd.com>
Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit ef71f00173228904763552b7405169023f8034a8)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index 853365dee2a791a1075939a208820b078fc1298c..bb0ee17b4cbfb104d0c3cf007ba98f7d1bd2409e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -2304,6 +2304,7 @@ static int amdgpu_discovery_set_psp_ip_blocks(struct amdgpu_device *adev)
                amdgpu_device_ip_block_add(adev, &psp_v14_0_ip_block);
                break;
        case IP_VERSION(15, 0, 0):
+       case IP_VERSION(15, 0, 9):
                amdgpu_device_ip_block_add(adev, &psp_v15_0_ip_block);
                break;
        case IP_VERSION(15, 0, 8):

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index 96e1b72b9e1c703e287aaca7f0c7bd4c1b479d6c..e0c0d7872e452bb31c8203d6765dbae622d3fbd2 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -275,6 +275,7 @@ static int psp_early_init(struct amdgpu_ip_block *ip_block)
                psp->boot_time_tmr = false;
                break;
        case IP_VERSION(15, 0, 0):
+       case IP_VERSION(15, 0, 9):
                psp_v15_0_0_set_psp_funcs(psp);
                psp->boot_time_tmr = false;
                break;
@@ -3475,7 +3476,9 @@ static int psp_load_non_psp_fw(struct psp_context *psp)
                     amdgpu_ip_version(adev, MP0_HWIP, 0) ==
                             IP_VERSION(15, 0, 0) ||
                     amdgpu_ip_version(adev, MP0_HWIP, 0) ==
-                            IP_VERSION(15, 0, 8)) &&
+                            IP_VERSION(15, 0, 8) ||
+                    amdgpu_ip_version(adev, MP0_HWIP, 0) ==
+                            IP_VERSION(15, 0, 9)) &&
                    (ucode->ucode_id == AMDGPU_UCODE_ID_SDMA1 ||
                     ucode->ucode_id == AMDGPU_UCODE_ID_SDMA2 ||
                     ucode->ucode_id == AMDGPU_UCODE_ID_SDMA3))