From 1f7625e45050f2d58190b407d34cf53d51bb0685 Mon Sep 17 00:00:00 2001 From: jsg Date: Fri, 11 Oct 2024 02:44:18 +0000 Subject: [PATCH] drm/amdgpu/gfx11: use rlc safe mode for soft recovery From Alex Deucher c20cd3d6d26156efbd3ec5b3fb17fae8237eb94b in linux-6.6.y/6.6.55 3f2d35c325534c1b7ac5072173f0dc7ca969dec2 in mainline linux --- sys/dev/pci/drm/amd/amdgpu/gfx_v11_0.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/pci/drm/amd/amdgpu/gfx_v11_0.c b/sys/dev/pci/drm/amd/amdgpu/gfx_v11_0.c index 2fe7ed4f178..5599d908ae3 100644 --- a/sys/dev/pci/drm/amd/amdgpu/gfx_v11_0.c +++ b/sys/dev/pci/drm/amd/amdgpu/gfx_v11_0.c @@ -5701,7 +5701,9 @@ static void gfx_v11_0_ring_soft_recovery(struct amdgpu_ring *ring, value = REG_SET_FIELD(value, SQ_CMD, MODE, 0x01); value = REG_SET_FIELD(value, SQ_CMD, CHECK_VMID, 1); value = REG_SET_FIELD(value, SQ_CMD, VM_ID, vmid); + amdgpu_gfx_rlc_enter_safe_mode(adev, 0); WREG32_SOC15(GC, 0, regSQ_CMD, value); + amdgpu_gfx_rlc_exit_safe_mode(adev, 0); } static void -- 2.20.1