On Thu, Mar 21, 2024 at 5:37 AM Mario Limonciello <superm1@xxxxxxxxx> wrote:
>
> From: Mario Limonciello <mario.limonciello@xxxxxxx>
>
> If the system hasn't entered GFXOFF when suspend starts it can cause
> hangs accessing GC and RLC during the suspend stage.
>
> Cc: <stable@xxxxxxxxxxxxxxx> # 6.1.y: 5095d5418193 ("drm/amd: Evict resources during PM ops prepare() callback")
> Cc: <stable@xxxxxxxxxxxxxxx> # 6.1.y: cb11ca3233aa ("drm/amd: Add concept of running prepare_suspend() sequence for IP blocks")
> Cc: <stable@xxxxxxxxxxxxxxx> # 6.1.y: 2ceec37b0e3d ("drm/amd: Add missing kernel doc for prepare_suspend()")
> Cc: <stable@xxxxxxxxxxxxxxx> # 6.1.y: 3a9626c816db ("drm/amd: Stop evicting resources on APUs in suspend")
> Cc: <stable@xxxxxxxxxxxxxxx> # 6.6.y: 5095d5418193 ("drm/amd: Evict resources during PM ops prepare() callback")
> Cc: <stable@xxxxxxxxxxxxxxx> # 6.6.y: cb11ca3233aa ("drm/amd: Add concept of running prepare_suspend() sequence for IP blocks")
> Cc: <stable@xxxxxxxxxxxxxxx> # 6.6.y: 2ceec37b0e3d ("drm/amd: Add missing kernel doc for prepare_suspend()")
> Cc: <stable@xxxxxxxxxxxxxxx> # 6.6.y: 3a9626c816db ("drm/amd: Stop evicting resources on APUs in suspend")
> Cc: <stable@xxxxxxxxxxxxxxx> # 6.1+
> Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3132
> Fixes: ab4750332dbe ("drm/amdgpu/sdma5.2: add begin/end_use ring callbacks")
> Signed-off-by: Mario Limonciello <mario.limonciello@xxxxxxx>
Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index 94bdb5fa6ebc..1fbaf7b81d69 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -4524,6 +4524,8 @@ int amdgpu_device_prepare(struct drm_device *dev)
> if (r)
> goto unprepare;
>
> + flush_delayed_work(&adev->gfx.gfx_off_delay_work);
> +
> for (i = 0; i < adev->num_ip_blocks; i++) {
> if (!adev->ip_blocks[i].status.valid)
> continue;
> --
> 2.34.1
>
