From: Aurabindo Pillai Date: Fri, 7 May 2021 19:52:01 +0000 (-0400) Subject: drm/amd/display: Enable HDCP for Beige Goby X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ac87f94294530bae182044a237110676a7f911e7;p=linux.git drm/amd/display: Enable HDCP for Beige Goby [Why&How] Add beige_goby_ta.bin to module firmware table and call psp init for TA Signed-off-by: Aurabindo Pillai Acked-by: Alex Deucher Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c index ba50b16d1b1b2..1f2e7e35c91e5 100644 --- a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c +++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c @@ -64,6 +64,7 @@ MODULE_FIRMWARE("amdgpu/vangogh_toc.bin"); MODULE_FIRMWARE("amdgpu/dimgrey_cavefish_sos.bin"); MODULE_FIRMWARE("amdgpu/dimgrey_cavefish_ta.bin"); MODULE_FIRMWARE("amdgpu/beige_goby_sos.bin"); +MODULE_FIRMWARE("amdgpu/beige_goby_ta.bin"); /* address block */ #define smnMP1_FIRMWARE_FLAGS 0x3010024 @@ -206,6 +207,9 @@ static int psp_v11_0_init_microcode(struct psp_context *psp) break; case CHIP_BEIGE_GOBY: err = psp_init_sos_microcode(psp, chip_name); + if (err) + return err; + err = psp_init_ta_microcode(psp, chip_name); if (err) return err; break;