[AMD Official Use Only - General] Hi Tim. > -----Original Message----- > From: Huang, Tim <Tim.Huang@xxxxxxx> > Sent: Thursday, March 30, 2023 10:33 AM > To: amd-gfx@xxxxxxxxxxxxxxxxxxxxx > Cc: Deucher, Alexander <Alexander.Deucher@xxxxxxx>; Limonciello, Mario > <Mario.Limonciello@xxxxxxx>; Zhang, Yifan <Yifan1.Zhang@xxxxxxx>; > Yuan, Perry <Perry.Yuan@xxxxxxx>; Du, Xiaojian <Xiaojian.Du@xxxxxxx>; > Ma, Li <Li.Ma@xxxxxxx>; Huang, Tim <Tim.Huang@xxxxxxx> > Subject: [PATCH] drm/amdgpu: allow more APUs to do mode2 reset when > go to S4 > > Skip mode2 reset only for IMU enabled APUs when do S4. > > This patch is to fix the regression issue > https://gitlab.freedesktop.org/drm/amd/-/issues/2483 > It is generated by patch "2bedd3f21b30 drm/amdgpu: skip ASIC reset for > APUs when go to S4". > > Signed-off-by: Tim Huang <tim.huang@xxxxxxx> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c > index 0f7cd3e8e00b..edaf3ded4a04 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c > @@ -981,7 +981,12 @@ static bool amdgpu_atcs_pci_probe_handle(struct > pci_dev *pdev) > */ > bool amdgpu_acpi_should_gpu_reset(struct amdgpu_device *adev) { > - if (adev->flags & AMD_IS_APU) > + if ((adev->flags & AMD_IS_APU) && > + adev->gfx.imu.funcs) /* Not need to do mode2 reset for IMU > enabled APUs */ > + return false; > + > + if ((adev->flags & AMD_IS_APU) && > + amdgpu_acpi_is_s3_active(adev)) > return false; > > if (amdgpu_sriov_vf(adev)) > -- > 2.25.1 Thanks for the quick fix. Tested-by: Yuan Perry <Perry.Yuan@xxxxxxx>
