On Mon, Mar 8, 2021 at 10:52 PM Prike Liang <[email protected]> wrote: > > During system hibernation suspend still need un-gate gfx CG/PG firstly to > handle HW > status check before HW resource destory. > > Signed-off-by: Prike Liang <[email protected]>
This is fine for stable, but we should work on cleaning this up. I have a patch set to improve this, but it's more invasive. We really need to sort out what specific parts of amdgpu_device_ip_suspend_phase2() are problematic and special case them. We shouldn't just be skipping that function. Acked-by: Alex Deucher <[email protected]> Alex > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > index e247c3a..7079bfc 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > @@ -2683,7 +2683,7 @@ static int amdgpu_device_ip_suspend_phase1(struct > amdgpu_device *adev) > { > int i, r; > > - if (adev->in_poweroff_reboot_com || > + if (adev->in_poweroff_reboot_com || adev->in_hibernate || > !amdgpu_acpi_is_s0ix_supported(adev) || amdgpu_in_reset(adev)) { > amdgpu_device_set_pg_state(adev, AMD_PG_STATE_UNGATE); > amdgpu_device_set_cg_state(adev, AMD_CG_STATE_UNGATE); > @@ -3750,7 +3750,7 @@ int amdgpu_device_suspend(struct drm_device *dev, bool > fbcon) > > amdgpu_fence_driver_suspend(adev); > > - if (adev->in_poweroff_reboot_com || > + if (adev->in_poweroff_reboot_com || adev->in_hibernate || > !amdgpu_acpi_is_s0ix_supported(adev) || amdgpu_in_reset(adev)) > r = amdgpu_device_ip_suspend_phase2(adev); > else > -- > 2.7.4 > > _______________________________________________ > amd-gfx mailing list > [email protected] > https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
