[AMD Official Use Only - General] Series is Reviewed-by: Aaron Liu <aaron.liu@xxxxxxx> > -----Original Message----- > From: amd-gfx <amd-gfx-bounces@xxxxxxxxxxxxxxxxxxxxx> On Behalf Of Yifan > Zhang > Sent: Tuesday, November 22, 2022 1:50 PM > To: amd-gfx@xxxxxxxxxxxxxxxxxxxxx > Cc: Deucher, Alexander <Alexander.Deucher@xxxxxxx>; Huang, Tim > <Tim.Huang@xxxxxxx>; Du, Xiaojian <Xiaojian.Du@xxxxxxx>; Zhang, Yifan > <Yifan1.Zhang@xxxxxxx> > Subject: [PATCH 19/19] drm/amdgpu: enable PSP IP v13.0.11 support > > From: Tim Huang <tim.huang@xxxxxxx> > > Enable PSP FW loading for PSP IP v13.0.11 > > Signed-off-by: Tim Huang <tim.huang@xxxxxxx> > Signed-off-by: Yifan Zhang <yifan1.zhang@xxxxxxx> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 1 + > drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 3 +++ > 2 files changed, 4 insertions(+) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c > index 7bb2de1d11ff..4670b86ebf74 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c > @@ -165,6 +165,7 @@ static int psp_early_init(void *handle) > case IP_VERSION(13, 0, 5): > case IP_VERSION(13, 0, 8): > case IP_VERSION(13, 0, 10): > + case IP_VERSION(13, 0, 11): > psp_v13_0_set_psp_funcs(psp); > psp->autoload_supported = true; > break; > diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c > b/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c > index 2abf48f187fa..1c7eb46aa4e1 100644 > --- a/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c > @@ -45,6 +45,8 @@ MODULE_FIRMWARE("amdgpu/psp_13_0_7_sos.bin"); > MODULE_FIRMWARE("amdgpu/psp_13_0_7_ta.bin"); > MODULE_FIRMWARE("amdgpu/psp_13_0_10_sos.bin"); > MODULE_FIRMWARE("amdgpu/psp_13_0_10_ta.bin"); > +MODULE_FIRMWARE("amdgpu/psp_13_0_11_toc.bin"); > +MODULE_FIRMWARE("amdgpu/psp_13_0_11_ta.bin"); > > /* For large FW files the time to complete can be very long */ #define > USBC_PD_POLLING_LIMIT_S 240 @@ -101,6 +103,7 @@ static int > psp_v13_0_init_microcode(struct psp_context *psp) > case IP_VERSION(13, 0, 3): > case IP_VERSION(13, 0, 5): > case IP_VERSION(13, 0, 8): > + case IP_VERSION(13, 0, 11): > err = psp_init_toc_microcode(psp, chip_name); > if (err) > return err; > -- > 2.37.3
<<attachment: winmail.dat>>