mbox series

[SRU,L,0/3] amdgpu: Fixes for S0i3 resume on Phoenix

Message ID 20230831140831.465693-1-tjaalton@ubuntu.com
Headers show
Series amdgpu: Fixes for S0i3 resume on Phoenix | expand

Message

Timo Aaltonen Aug. 31, 2023, 2:08 p.m. UTC
BugLink: https://bugs.launchpad.net/bugs/2033654

[Impact]

Hard hangs in some cases on resume from suspend on AMD Phoenix

[Fix]

pick three commits from v6.5-rc7 (also in 6.1.47):

730d44e1fa306a2 drm/amd/pm: skip the RLC stop when S0i3 suspend for SMU v13.0.4/11
f1740b1ab2703b2 drm/amdgpu: skip fence GFX interrupts disable/enable for S0ix
a7b7d9e8aee4f71 drm/amd: flush any delayed gfxoff on suspend entry

[Test Case]

Check the updated kernel on a failing system, and test resume from suspend.

[Where problems could occur]

These are cherry-picks from upstream stable, and limited to Phoenix


Mario Limonciello (1):
  drm/amd: flush any delayed gfxoff on suspend entry

Tim Huang (2):
  drm/amd/pm: skip the RLC stop when S0i3 suspend for SMU v13.0.4/11
  drm/amdgpu: skip fence GFX interrupts disable/enable for S0ix

 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c |  1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c  | 41 ++++++++++++++++++++--
 drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c    |  9 +----
 drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c  |  4 +--
 4 files changed, 43 insertions(+), 12 deletions(-)

Comments

Tim Gardner Aug. 31, 2023, 2:50 p.m. UTC | #1
On 8/31/23 8:08 AM, Timo Aaltonen wrote:
> 
> BugLink: https://bugs.launchpad.net/bugs/2033654
> 
> [Impact]
> 
> Hard hangs in some cases on resume from suspend on AMD Phoenix
> 
> [Fix]
> 
> pick three commits from v6.5-rc7 (also in 6.1.47):
> 
> 730d44e1fa306a2 drm/amd/pm: skip the RLC stop when S0i3 suspend for SMU v13.0.4/11
> f1740b1ab2703b2 drm/amdgpu: skip fence GFX interrupts disable/enable for S0ix
> a7b7d9e8aee4f71 drm/amd: flush any delayed gfxoff on suspend entry
> 
> [Test Case]
> 
> Check the updated kernel on a failing system, and test resume from suspend.
> 
> [Where problems could occur]
> 
> These are cherry-picks from upstream stable, and limited to Phoenix
> 
> 
> Mario Limonciello (1):
>    drm/amd: flush any delayed gfxoff on suspend entry
> 
> Tim Huang (2):
>    drm/amd/pm: skip the RLC stop when S0i3 suspend for SMU v13.0.4/11
>    drm/amdgpu: skip fence GFX interrupts disable/enable for S0ix
> 
>   drivers/gpu/drm/amd/amdgpu/amdgpu_device.c |  1 +
>   drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c  | 41 ++++++++++++++++++++--
>   drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c    |  9 +----
>   drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c  |  4 +--
>   4 files changed, 43 insertions(+), 12 deletions(-)
> 
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Stefan Bader Aug. 31, 2023, 3:35 p.m. UTC | #2
On 31.08.23 16:08, Timo Aaltonen wrote:
> 
> BugLink: https://bugs.launchpad.net/bugs/2033654
> 
> [Impact]
> 
> Hard hangs in some cases on resume from suspend on AMD Phoenix
> 
> [Fix]
> 
> pick three commits from v6.5-rc7 (also in 6.1.47):
> 
> 730d44e1fa306a2 drm/amd/pm: skip the RLC stop when S0i3 suspend for SMU v13.0.4/11
> f1740b1ab2703b2 drm/amdgpu: skip fence GFX interrupts disable/enable for S0ix
> a7b7d9e8aee4f71 drm/amd: flush any delayed gfxoff on suspend entry
> 
> [Test Case]
> 
> Check the updated kernel on a failing system, and test resume from suspend.
> 
> [Where problems could occur]
> 
> These are cherry-picks from upstream stable, and limited to Phoenix
> 
> 
> Mario Limonciello (1):
>    drm/amd: flush any delayed gfxoff on suspend entry
> 
> Tim Huang (2):
>    drm/amd/pm: skip the RLC stop when S0i3 suspend for SMU v13.0.4/11
>    drm/amdgpu: skip fence GFX interrupts disable/enable for S0ix
> 
>   drivers/gpu/drm/amd/amdgpu/amdgpu_device.c |  1 +
>   drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c  | 41 ++++++++++++++++++++--
>   drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c    |  9 +----
>   drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c  |  4 +--
>   4 files changed, 43 insertions(+), 12 deletions(-)
> 

Acked-by: Stefan Bader <stefan.bader@canonical.com>
Roxana Nicolescu Sept. 1, 2023, 9:40 a.m. UTC | #3
On 31/08/2023 16:08, Timo Aaltonen wrote:
> BugLink: https://bugs.launchpad.net/bugs/2033654
>
> [Impact]
>
> Hard hangs in some cases on resume from suspend on AMD Phoenix
>
> [Fix]
>
> pick three commits from v6.5-rc7 (also in 6.1.47):
>
> 730d44e1fa306a2 drm/amd/pm: skip the RLC stop when S0i3 suspend for SMU v13.0.4/11
> f1740b1ab2703b2 drm/amdgpu: skip fence GFX interrupts disable/enable for S0ix
> a7b7d9e8aee4f71 drm/amd: flush any delayed gfxoff on suspend entry
>
> [Test Case]
>
> Check the updated kernel on a failing system, and test resume from suspend.
>
> [Where problems could occur]
>
> These are cherry-picks from upstream stable, and limited to Phoenix
>
>
> Mario Limonciello (1):
>    drm/amd: flush any delayed gfxoff on suspend entry
>
> Tim Huang (2):
>    drm/amd/pm: skip the RLC stop when S0i3 suspend for SMU v13.0.4/11
>    drm/amdgpu: skip fence GFX interrupts disable/enable for S0ix
>
>   drivers/gpu/drm/amd/amdgpu/amdgpu_device.c |  1 +
>   drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c  | 41 ++++++++++++++++++++--
>   drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c    |  9 +----
>   drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c  |  4 +--
>   4 files changed, 43 insertions(+), 12 deletions(-)
>
Applied to lunar:master-next. Thanks!

Roxana