On Tue, Jan 10, 2023 at 2:40 PM Limonciello, Mario <Mario.Limonciello@xxxxxxx> wrote: > > [AMD Official Use Only - General] > > > > > -----Original Message----- > > From: Alex Deucher <alexdeucher@xxxxxxxxx> > > Sent: Tuesday, January 10, 2023 13:29 > > To: Limonciello, Mario <Mario.Limonciello@xxxxxxx> > > Cc: amd-gfx@xxxxxxxxxxxxxxxxxxxxx > > Subject: Re: [PATCH] drm/amd: Only load TA microcode for psp v12_0 once > > > > On Tue, Jan 10, 2023 at 2:16 PM Mario Limonciello > > <mario.limonciello@xxxxxxx> wrote: > > > > > > 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> > > > > Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx> > > > > I'll squash this into f1efed401badb. > > You mean when you send it up for drm-next? At least for amd-staging-drm-next it > should probably be it's own separate commit though still right? Correct. Alex > > > > > Alex > > > > > --- > > > 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 > > >