From: jsg <jsg@openbsd.org>
Date: Fri, 11 Oct 2024 02:45:38 +0000 (+0000)
Subject: drm/amdgpu/gfx10: use rlc safe mode for soft recovery
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=a898d4c00697bd319367ec4e0fb55d2133d9dc1b;p=openbsd

drm/amdgpu/gfx10: use rlc safe mode for soft recovery

From Alex Deucher
4298813a43f72f6c8c71aa70a9e32b8fd0ad5f60 in linux-6.6.y/6.6.55
ead60e9c4e29c8574cae1be4fe3af1d9a978fb0f in mainline linux
---

diff --git a/sys/dev/pci/drm/amd/amdgpu/gfx_v10_0.c b/sys/dev/pci/drm/amd/amdgpu/gfx_v10_0.c
index 699e1829fa2..8772e73d241 100644
--- a/sys/dev/pci/drm/amd/amdgpu/gfx_v10_0.c
+++ b/sys/dev/pci/drm/amd/amdgpu/gfx_v10_0.c
@@ -8748,7 +8748,9 @@ static void gfx_v10_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, mmSQ_CMD, value);
+	amdgpu_gfx_rlc_exit_safe_mode(adev, 0);
 }
 
 static void