From: Gangliang Xie <[email protected]> add ta loading in psp v15_0_3
Signed-off-by: Gangliang Xie <[email protected]> Reviewed-by: Hawking Zhang <[email protected]> Signed-off-by: Alex Deucher <[email protected]> --- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 + drivers/gpu/drm/amd/amdgpu/psp_v15_0_3.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c index 89b09ab2a34f8..d43f036a3f37a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c @@ -3160,6 +3160,7 @@ static int amdgpu_discovery_set_ras_ip_blocks(struct amdgpu_device *adev) case IP_VERSION(13, 0, 12): case IP_VERSION(13, 0, 14): case IP_VERSION(15, 0, 8): + case IP_VERSION(15, 0, 3): amdgpu_device_ip_block_add(adev, &ras_v1_0_ip_block); break; default: diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v15_0_3.c b/drivers/gpu/drm/amd/amdgpu/psp_v15_0_3.c index d07588e8efb3a..cab3bec1e5127 100644 --- a/drivers/gpu/drm/amd/amdgpu/psp_v15_0_3.c +++ b/drivers/gpu/drm/amd/amdgpu/psp_v15_0_3.c @@ -64,7 +64,9 @@ static int psp_v15_0_3_init_microcode(struct psp_context *psp) err = psp_init_sos_microcode(psp, ucode_prefix); if (err) return err; - + err = psp_init_ta_microcode(psp, ucode_prefix); + if (err) + return err; break; default: BUG(); -- 2.55.0
