From: Aurabindo Pillai Date: Tue, 28 Jun 2022 19:07:16 +0000 (-0400) Subject: drm/amd: Load TA firmware for DCN321/DCN32 X-Git-Tag: timers-urgent-2022-08-13~43^2~16^2~23 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7268f0a9e842c52fa73b9f5afc1bebcf9f7d48b7;p=users%2Fdwmw2%2Flinux.git drm/amd: Load TA firmware for DCN321/DCN32 [Why&How] TA firmware is needed to enable HDCP. Changes in v2: Load separate firmware for PSP 13.0.0 Signed-off-by: Aurabindo Pillai Acked-by: Alex Deucher Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c index 9e1ef81933ff0..30386d34d0d64 100644 --- a/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c +++ b/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c @@ -39,7 +39,9 @@ MODULE_FIRMWARE("amdgpu/psp_13_0_5_ta.bin"); MODULE_FIRMWARE("amdgpu/psp_13_0_8_toc.bin"); MODULE_FIRMWARE("amdgpu/psp_13_0_8_ta.bin"); MODULE_FIRMWARE("amdgpu/psp_13_0_0_sos.bin"); +MODULE_FIRMWARE("amdgpu/psp_13_0_0_ta.bin"); MODULE_FIRMWARE("amdgpu/psp_13_0_7_sos.bin"); +MODULE_FIRMWARE("amdgpu/psp_13_0_7_ta.bin"); /* For large FW files the time to complete can be very long */ #define USBC_PD_POLLING_LIMIT_S 240 @@ -103,6 +105,10 @@ static int psp_v13_0_init_microcode(struct psp_context *psp) case IP_VERSION(13, 0, 0): case IP_VERSION(13, 0, 7): err = psp_init_sos_microcode(psp, chip_name); + if (err) + return err; + /* It's not necessary to load ras ta on Guest side */ + err = psp_init_ta_microcode(psp, chip_name); if (err) return err; break;