drm/amdgpu: add PSP 14.0.0 support

Uses same driver interface as 13.0.

Signed-off-by: Li Ma <li.ma@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 6ffc1a640d2dc6a7f3f5156ea9d93a2aa5882595..4e428060a1fa292e1473756a9c7449c91d4eb16d 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -202,6 +202,7 @@ static int psp_early_init(void *handle)
        case IP_VERSION(13, 0, 5):
        case IP_VERSION(13, 0, 8):
        case IP_VERSION(13, 0, 11):
+       case IP_VERSION(14, 0, 0):
                psp_v13_0_set_psp_funcs(psp);
                psp->autoload_supported = true;
                break;

diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c
index e1a392bcea70d3ae99b1a504a118a9728c43e736..d23827d3d8ccaad2941df86c07bc43fec7f62334 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c
@@ -50,6 +50,8 @@ MODULE_FIRMWARE("amdgpu/psp_13_0_11_toc.bin");
 MODULE_FIRMWARE("amdgpu/psp_13_0_11_ta.bin");
 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");
 
 /* For large FW files the time to complete can be very long */
 #define USBC_PD_POLLING_LIMIT_S 240
@@ -94,6 +96,7 @@ static int psp_v13_0_init_microcode(struct psp_context *psp)
        case IP_VERSION(13, 0, 5):
        case IP_VERSION(13, 0, 8):
        case IP_VERSION(13, 0, 11):
+       case IP_VERSION(14, 0, 0):
                err = psp_init_toc_microcode(psp, ucode_prefix);
                if (err)
                        return err;