Acked-by: Alex Deucher <alexander.deucher@xxxxxxx> On Fri, Jun 18, 2021 at 5:17 AM Chengzhe Liu <ChengZhe.Liu@xxxxxxx> wrote: > > When unloading driver, if VCN is powered on, sending message > DisableAllSmuFeatures to SMU will cause SMU hang. We need to > power down VCN and JPEG before clean up SMU. > > Signed-off-by: Chengzhe Liu <ChengZhe.Liu@xxxxxxx> > --- > drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c > index cb375f1beebd..ebe672142808 100644 > --- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c > +++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c > @@ -1453,10 +1453,14 @@ static int smu_hw_fini(void *handle) > > if (smu->is_apu) { > smu_powergate_sdma(&adev->smu, true); > - smu_dpm_set_vcn_enable(smu, false); > - smu_dpm_set_jpeg_enable(smu, false); > } > > + smu_dpm_set_vcn_enable(smu, false); > + smu_dpm_set_jpeg_enable(smu, false); > + > + adev->vcn.cur_state = AMD_PG_STATE_GATE; > + adev->jpeg.cur_state = AMD_PG_STATE_GATE; > + > if (!smu->pm_enabled) > return 0; > > -- > 2.25.1 > > _______________________________________________ > amd-gfx mailing list > amd-gfx@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ amd-gfx mailing list amd-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/amd-gfx