drm/amdgpu: add support for psp 13.0.5

Enabl psp support for psp 13.0.5.

Signed-off-by: Yifan Zhang <yifan1.zhang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Huang Rui <ray.huang@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 6f5cb03d81f6ff5f5a6485db06b9d39c452ca876..7883799ecfe83a174a76e75aa8ee9b002313a72b 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -1292,6 +1292,7 @@ static int amdgpu_discovery_set_psp_ip_blocks(struct amdgpu_device *adev)
        case IP_VERSION(13, 0, 1):
        case IP_VERSION(13, 0, 2):
        case IP_VERSION(13, 0, 3):
+       case IP_VERSION(13, 0, 5):
        case IP_VERSION(13, 0, 8):
                amdgpu_device_ip_block_add(adev, &psp_v13_0_ip_block);
                break;

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index ecbdbe3ea4aa6c1d9ef410060facce4673d48020..94bfe502b55e32e98291b872a6afcea657240af4 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -133,6 +133,7 @@ static int psp_early_init(void *handle)
                break;
        case IP_VERSION(13, 0, 1):
        case IP_VERSION(13, 0, 3):
+       case IP_VERSION(13, 0, 5):
        case IP_VERSION(13, 0, 8):
                psp_v13_0_set_psp_funcs(psp);
                psp->autoload_supported = true;

diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c
index 17160849a811442917fb6c03943f487e6a1bbc82..2c6070b90dcf123a9bba209213090bbc5b925b1b 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c
@@ -34,6 +34,9 @@ MODULE_FIRMWARE("amdgpu/aldebaran_ta.bin");
 MODULE_FIRMWARE("amdgpu/yellow_carp_asd.bin");
 MODULE_FIRMWARE("amdgpu/yellow_carp_toc.bin");
 MODULE_FIRMWARE("amdgpu/yellow_carp_ta.bin");
+MODULE_FIRMWARE("amdgpu/psp_13_0_5_asd.bin");
+MODULE_FIRMWARE("amdgpu/psp_13_0_5_toc.bin");
+MODULE_FIRMWARE("amdgpu/psp_13_0_5_ta.bin");
 MODULE_FIRMWARE("amdgpu/psp_13_0_8_asd.bin");
 MODULE_FIRMWARE("amdgpu/psp_13_0_8_toc.bin");
 MODULE_FIRMWARE("amdgpu/psp_13_0_8_ta.bin");
@@ -58,6 +61,9 @@ static int psp_v13_0_init_microcode(struct psp_context *psp)
        case IP_VERSION(13, 0, 3):
                chip_name = "yellow_carp";
                break;
+       case IP_VERSION(13, 0, 5):
+               chip_name = "psp_13_0_5";
+               break;
        case IP_VERSION(13, 0, 8):
                chip_name = "psp_13_0_8";
                break;
@@ -75,6 +81,7 @@ static int psp_v13_0_init_microcode(struct psp_context *psp)
                break;
        case IP_VERSION(13, 0, 1):
        case IP_VERSION(13, 0, 3):
+       case IP_VERSION(13, 0, 5):
        case IP_VERSION(13, 0, 8):
                err = psp_init_asd_microcode(psp, chip_name);
                if (err)