Skip to content

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

Timur Kristóf amd-gfx 1 version Applied

Status from this message: Applied the series. Thanks!

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest10 patches 1 replyApplied

Changes from v1 to v2 from the cover letter

* Add more explanation to various patches
* Drop patch that enables some IRQs
* Drop VM flush changes (will be submitted separately)

Patches in v1 Applied

#Subject and filesSizeRepliesApplied
1/10drm/amdgpu/gfx6: Fixup emit_cntxcntl()drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c+21 -71 reply
2/10drm/amdgpu/gfx6: Fixup emitting SWITCH_BUFFER packetsdrivers/gpu/drm/amd/amdgpu/gfx_v6_0.c+14 -240 replies
3/10drm/amdgpu/gfx6: Use PFP on the compute queues toodrivers/gpu/drm/amd/amdgpu/gfx_v6_0.c+4 -40 replies
4/10drm/amdgpu/gfx6: Initialize compute rings before CP startdrivers/gpu/drm/amd/amdgpu/gfx_v6_0.c+70 -640 replies
5/10drm/amdgpu/gfx6: Clean up rings during resetdrivers/gpu/drm/amd/amdgpu/gfx_v6_0.c+18 -40 replies
6/10drm/amdgpu/gfx6: Execute CLEAR_STATE when initializing compute ringsdrivers/gpu/drm/amd/amdgpu/gfx_v6_0.c+8 -00 replies
7/10drm/amdgpu/gfx6: Adjust how harvested TCCs are set updrivers/gpu/drm/amd/amdgpu/gfx_v6_0.c+9 -20 replies
8/10drm/amdgpu/gfx6: Use COND_EXECdrivers/gpu/drm/amd/amdgpu/gfx_v6_0.c+24 -00 replies
9/10drm/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+124 -80 replies
10/10drm/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

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 00/10] drm/amdgpu/gfx6: Use GFX IP block soft reset on GFX6 (v2)

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)

Changes from v1 to v2:

* Add more explanation to various patches
* Drop patch that enables some IRQs
* Drop VM flush changes (will be submitted separately)

Timur Kristóf (10):
drm/amdgpu/gfx6: Fixup 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: 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         | 374 +++++++++++++-----
 .../include/asic_reg/gca/gfx_6_0_sh_mask.h    |  32 +-
 2 files changed, 295 insertions(+), 111 deletions(-)
Signature · 1 line
2.55.0