From: John Clements Date: Thu, 1 Aug 2019 10:05:50 +0000 (+0800) Subject: drm/amdgpu: add PSP SW init support for Arcturus X-Git-Tag: v5.4-rc1~106^2~17^2~58 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f36d9ab95f0f775fd21d3b8dc4e15fd34eda8004;p=thirdparty%2Flinux.git drm/amdgpu: add PSP SW init support for Arcturus Add arcturus cases to psp init sewquence. Signed-off-by: John Clements Reviewed-by: Hawking Zhang Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c index 1f9105a6c0500..24fefd19d410c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c @@ -53,6 +53,7 @@ static int psp_early_init(void *handle) psp->autoload_supported = false; break; case CHIP_VEGA20: + case CHIP_ARCTURUS: psp_v11_0_set_psp_funcs(psp); psp->autoload_supported = false; break; diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c index 2ccd9489a41d9..40f19718c5158 100644 --- a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c +++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c @@ -45,6 +45,8 @@ MODULE_FIRMWARE("amdgpu/navi10_sos.bin"); MODULE_FIRMWARE("amdgpu/navi10_asd.bin"); MODULE_FIRMWARE("amdgpu/navi14_sos.bin"); MODULE_FIRMWARE("amdgpu/navi14_asd.bin"); +MODULE_FIRMWARE("amdgpu/arcturus_sos.bin"); +MODULE_FIRMWARE("amdgpu/arcturus_asd.bin"); /* address block */ #define smnMP1_FIRMWARE_FLAGS 0x3010024 @@ -164,6 +166,7 @@ static int psp_v11_0_init_microcode(struct psp_context *psp) break; case CHIP_NAVI10: case CHIP_NAVI14: + case CHIP_ARCTURUS: break; default: BUG();