releases/6.6.26/drm-amd-flush-gfxoff-requests-in-prepare-stage.patch

   1 From 821d6c4dd4680b8ea0d918b54bd6707967383e11 Mon Sep 17 00:00:00 2001
   2 From: Sasha Levin <sashal@kernel.org>
   3 Date: Wed, 20 Mar 2024 13:32:21 -0500
   4 Subject: drm/amd: Flush GFXOFF requests in prepare stage
   5
   6 From: Mario Limonciello <mario.limonciello@amd.com>
   7
   8 [ Upstream commit ca299b4512d4b4f516732a48ce9aa19d91f4473e ]
   9
  10 If the system hasn't entered GFXOFF when suspend starts it can cause
  11 hangs accessing GC and RLC during the suspend stage.
  12
  13 Cc: <stable@vger.kernel.org> # 6.1.y: 5095d5418193 ("drm/amd: Evict resources during PM ops prepare() callback")
  14 Cc: <stable@vger.kernel.org> # 6.1.y: cb11ca3233aa ("drm/amd: Add concept of running prepare_suspend() sequence for IP blocks")
  15 Cc: <stable@vger.kernel.org> # 6.1.y: 2ceec37b0e3d ("drm/amd: Add missing kernel doc for prepare_suspend()")
  16 Cc: <stable@vger.kernel.org> # 6.1.y: 3a9626c816db ("drm/amd: Stop evicting resources on APUs in suspend")
  17 Cc: <stable@vger.kernel.org> # 6.6.y: 5095d5418193 ("drm/amd: Evict resources during PM ops prepare() callback")
  18 Cc: <stable@vger.kernel.org> # 6.6.y: cb11ca3233aa ("drm/amd: Add concept of running prepare_suspend() sequence for IP blocks")
  19 Cc: <stable@vger.kernel.org> # 6.6.y: 2ceec37b0e3d ("drm/amd: Add missing kernel doc for prepare_suspend()")
  20 Cc: <stable@vger.kernel.org> # 6.6.y: 3a9626c816db ("drm/amd: Stop evicting resources on APUs in suspend")
  21 Cc: <stable@vger.kernel.org> # 6.1+
  22 Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3132
  23 Fixes: ab4750332dbe ("drm/amdgpu/sdma5.2: add begin/end_use ring callbacks")
  24 Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
  25 Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
  26 Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
  27 Signed-off-by: Sasha Levin <sashal@kernel.org>
  28 ---
  29  drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 ++
  30  1 file changed, 2 insertions(+)
  31
  32 diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
  33 index 4ebe42395708f..062d78818da16 100644
  34 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
  35 +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
  36 @@ -4117,6 +4117,8 @@ int amdgpu_device_prepare(struct drm_device *dev)
  37         if (r)
  38                 return r;
  39
  40 +       flush_delayed_work(&adev->gfx.gfx_off_delay_work);
  41 +
  42         for (i = 0; i < adev->num_ip_blocks; i++) {
  43                 if (!adev->ip_blocks[i].status.valid)
  44                         continue;
  45 --
  46 2.43.0
  47