drm/amdgpu: initialize ta firmware for aldebaran

Hawking Zhang · alexdeucher · commit fbaa30d87fd8 · 2021-03-23T22:54:15.000-04:00
only xgmi ta is supported at this stage

Signed-off-by: Hawking Zhang &lt;Hawking.Zhang@amd.com&gt;
Reviewed-by: Kevin Wang &lt;kevin1.wang@amd.com&gt;
Signed-off-by: Alex Deucher &lt;alexander.deucher@amd.com&gt;
diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c
@@ -30,6 +30,7 @@
 #include "mp/mp_13_0_2_sh_mask.h"
 
 MODULE_FIRMWARE("amdgpu/aldebaran_sos.bin");
+MODULE_FIRMWARE("amdgpu/aldebaran_ta.bin");
 
 static int psp_v13_0_init_microcode(struct psp_context *psp)
 {
@@ -46,6 +47,10 @@ static int psp_v13_0_init_microcode(struct psp_context *psp)
 	}
 
 	err = psp_init_sos_microcode(psp, chip_name);
+	if (err)
+		return err;
+
+	err = psp_init_ta_microcode(&adev->psp, chip_name);
 
 	return err;
 }

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@`
`30`	`30`	`#include "mp/mp_13_0_2_sh_mask.h"`
`31`	`31`
`32`	`32`	`MODULE_FIRMWARE("amdgpu/aldebaran_sos.bin");`
	`33`	`+MODULE_FIRMWARE("amdgpu/aldebaran_ta.bin");`
`33`	`34`
`34`	`35`	`static int psp_v13_0_init_microcode(struct psp_context *psp)`
`35`	`36`	`{`
`@@ -46,6 +47,10 @@ static int psp_v13_0_init_microcode(struct psp_context *psp)`
`46`	`47`	`}`
`47`	`48`
`48`	`49`	`err = psp_init_sos_microcode(psp, chip_name);`
	`50`	`+ if (err)`
	`51`	`+ return err;`
	`52`	`+`
	`53`	`+ err = psp_init_ta_microcode(&adev->psp, chip_name);`
`49`	`54`
`50`	`55`	`return err;`
`51`	`56`	`}`