Skip to content

drm/amdgpu/gfx6: Use GFX IP block soft reset on GFX6

Timur Kristóf amd-gfx 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest11 patches 7 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/11drm/amdgpu/gfx6: Improve emit_cntxcntl()drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c+21 -70 replies
2/11drm/amdgpu/gfx6: Fixup emitting SWITCH_BUFFER packetsdrivers/gpu/drm/amd/amdgpu/gfx_v6_0.c+14 -240 replies
3/11drm/amdgpu/gfx6: Use PFP on the compute queues toodrivers/gpu/drm/amd/amdgpu/gfx_v6_0.c+8 -140 replies
4/11drm/amdgpu/gfx6: Initialize compute rings before CP startdrivers/gpu/drm/amd/amdgpu/gfx_v6_0.c+70 -640 replies
5/11drm/amdgpu/gfx6: Clean up rings during resetdrivers/gpu/drm/amd/amdgpu/gfx_v6_0.c+24 -40 replies
6/11drm/amdgpu/gfx6: Execute CLEAR_STATE when initializing compute ringsdrivers/gpu/drm/amd/amdgpu/gfx_v6_0.c+8 -00 replies
7/11drm/amdgpu/gfx6: Properly enable/disable priv_req and priv_inst interruptsdrivers/gpu/drm/amd/amdgpu/gfx_v6_0.c+19 -07 replies
8/11drm/amdgpu/gfx6: Adjust how harvested TCCs are set updrivers/gpu/drm/amd/amdgpu/gfx_v6_0.c+9 -20 replies
9/11drm/amdgpu/gfx6: Use COND_EXECdrivers/gpu/drm/amd/amdgpu/gfx_v6_0.c+24 -00 replies
10/11drm/amdgpu/gfx6: Add IP block soft reset implementationdrivers/gpu/drm/amd/amdgpu/gfx_v6_0.c drivers/gpu/drm/amd/include/asic_reg/gca/gfx_6_0_sh_mask.h+118 -80 replies
11/11drm/amdgpu/gfx6: Enable IP block soft reset as a GPU recovery methoddrivers/gpu/drm/amd/amdgpu/gfx_v6_0.c+5 -00 replies

Reviews trailers per patch

1 of 11 patches has a Reviewed-by or Acked-by.

PatchTvrtko Ursulin
1/11
2/11
3/11
4/11
5/11
6/11
7/11R-b
8/11
9/11
10/11
11/11

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH 00/11] drm/amdgpu/gfx6: Use GFX IP block soft reset on GFX6

Fix up various things in the GFX6 code to prepare it to work with IP block soft reset. The main challenge was figuring out how to properly initialize the compute queues so that they work well after a reset, as well as realizing that on GFX6 the compute queues also have a PFP (as opposed to GFX7+ where PFP is a graphics only thing). There are also other minor fixes.

Implement GFX6 IP block soft reset: just reset everything in the GFX IP block (instead of taking a guess at which parts need to be reset) to make it consistent, and also handle clock and power gating to make sure not to degrade GPU functionality after a GFX IP block soft reset.

This improves current user experience on all GFX6 chips:

On GFX6 dGPUs, the current GPU recovery method always clears the contents of VRAM, which means that a buggy (hanging) app can crash the whole graphical session, which is less than ideal.

Using GFX IP block soft reset means that we can now move on from GFX hangs on dGPUs without crashing the whole system.

Tested on the following chips:

Tahiti (FirePro W9000, Radeon HD 7870 XT)
Cape Verde (Radeon R7 450)
Pitcairn (Radeon R9 270X)
Oland (Radeon 430)

Timur Kristóf (11):
drm/amdgpu/gfx6: Improve emit_cntxcntl()
drm/amdgpu/gfx6: Fixup emitting SWITCH_BUFFER packets drm/amdgpu/gfx6: Use PFP on the compute queues too drm/amdgpu/gfx6: Initialize compute rings before CP start drm/amdgpu/gfx6: Clean up rings during reset drm/amdgpu/gfx6: Execute CLEAR_STATE when initializing compute rings drm/amdgpu/gfx6: Properly enable/disable priv_req and priv_inst
interrupts
drm/amdgpu/gfx6: Adjust how harvested TCCs are set up drm/amdgpu/gfx6: Use COND_EXEC
drm/amdgpu/gfx6: Add IP block soft reset implementation drm/amdgpu/gfx6: Enable IP block soft reset as a GPU recovery method

 drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c         | 403 +++++++++++++-----
 .../include/asic_reg/gca/gfx_6_0_sh_mask.h    |  32 +-
 2 files changed, 316 insertions(+), 119 deletions(-)
Signature · 1 line
2.55.0