[PATCH] drm/amd: Only load TA microcode for psp v12_0 once

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



During rebase from patch series accidentally ended up with two calls
to load TA microcode for psp v12_0. Only one is needed, so remove the
second.

Fixes: f1efed401badb ("drm/amd: Parse both v1 and v2 TA microcode headers using same function")
Signed-off-by: Mario Limonciello <mario.limonciello@xxxxxxx>
---
 drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c
index e82a0c2bf1faa..fcd708eae75cc 100644
--- a/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c
@@ -55,9 +55,6 @@ static int psp_v12_0_init_microcode(struct psp_context *psp)
 	amdgpu_ucode_ip_version_decode(adev, MP0_HWIP, ucode_prefix, sizeof(ucode_prefix));
 
 	err = psp_init_asd_microcode(psp, ucode_prefix);
-	if (err)
-		return err;
-	err = psp_init_ta_microcode(psp, ucode_prefix);
 	if (err)
 		return err;
 
-- 
2.25.1




[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux