Resetting a GFX pipe needs support from the CP firmware. Advertise AMDGPU_RESET_TYPE_PER_PIPE for GFX on GC 11.0.0/2/3, on top of the per queue reset, when the firmware is at least PFP 2790, ME 2600 and MEC 2850. With older firmware only the per queue reset stays available.
Signed-off-by: Jesse Zhang <[email protected]> --- drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c index 5d068a9d9c72..ea74defe7fea 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c @@ -1925,8 +1925,11 @@ static int gfx_v11_0_sw_init(struct amdgpu_ip_block *ip_block) !adev->debug_disable_gpu_ring_reset) { adev->gfx.compute_supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE; adev->gfx.gfx_supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE; - /* TODO: verify CP warm-reset support before enabling PER_PIPE. */ - /* adev->gfx.gfx_supported_reset |= AMDGPU_RESET_TYPE_PER_PIPE; */ + /* Resetting a GFX pipe needs the CP firmware to support it */ + if (adev->gfx.pfp_fw_version >= 2790 && + adev->gfx.me_fw_version >= 2600 && + adev->gfx.mec_fw_version >= 2850) + adev->gfx.gfx_supported_reset |= AMDGPU_RESET_TYPE_PER_PIPE; } break; default: -- 2.50.1
