drm/amdgpu/gfx9.4.3: use rlc safe mode for soft recovery
authorAlex Deucher <alexander.deucher@amd.com>
Wed, 24 Jul 2024 22:20:44 +0000 (18:20 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 16 Aug 2024 18:18:46 +0000 (14:18 -0400)
Protect the MMIO access with safe mode.

Acked-by: Vitaly Prosyak <vitaly.prosyak@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c

index 9215666a6318a5fe1d4114464cdfc2a1e93ebc3d..dd146322f209564e552390aaa8d7d0bee706724a 100644 (file)
@@ -3054,7 +3054,9 @@ static void gfx_v9_4_3_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, ring->xcc_id);
        WREG32_SOC15(GC, GET_INST(GC, ring->xcc_id), regSQ_CMD, value);
+       amdgpu_gfx_rlc_exit_safe_mode(adev, ring->xcc_id);
 }
 
 static void gfx_v9_4_3_xcc_set_compute_eop_interrupt_state(