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

alexdeucher · alexdeucher · commit 21818f39beda · 2024-09-02T11:41:34.000-04:00
Protect the MMIO access with safe mode.

Acked-by: Vitaly Prosyak &lt;vitaly.prosyak@amd.com&gt;
Signed-off-by: Alex Deucher &lt;alexander.deucher@amd.com&gt;
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
@@ -4620,7 +4620,9 @@ static void gfx_v12_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

Original file line number	Diff line number	Diff line change
`@@ -4620,7 +4620,9 @@ static void gfx_v12_0_ring_soft_recovery(struct amdgpu_ring *ring,`
`4620`	`4620`	`value = REG_SET_FIELD(value, SQ_CMD, MODE, 0x01);`
`4621`	`4621`	`value = REG_SET_FIELD(value, SQ_CMD, CHECK_VMID, 1);`
`4622`	`4622`	`value = REG_SET_FIELD(value, SQ_CMD, VM_ID, vmid);`
	`4623`	`+ amdgpu_gfx_rlc_enter_safe_mode(adev, 0);`
`4623`	`4624`	`WREG32_SOC15(GC, 0, regSQ_CMD, value);`
	`4625`	`+ amdgpu_gfx_rlc_exit_safe_mode(adev, 0);`
`4624`	`4626`	`}`
`4625`	`4627`
`4626`	`4628`	`static void`