Need to make sure gfxoff is disallowed when we touch GC
registers over MMIO.

Cc: Yifan Zhang <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
---
 drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c 
b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
index edb1e4d3f9292..c767429504e41 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
@@ -1689,6 +1689,7 @@ static int sdma_v5_0_set_trap_irq_state(struct 
amdgpu_device *adev,
 {
        u32 sdma_cntl;
 
+       amdgpu_gfx_off_ctrl(adev, false);
        if (!amdgpu_sriov_vf(adev)) {
                u32 reg_offset = (type == AMDGPU_SDMA_IRQ_INSTANCE0) ?
                        sdma_v5_0_get_reg_offset(adev, 0, mmSDMA0_CNTL) :
@@ -1699,6 +1700,7 @@ static int sdma_v5_0_set_trap_irq_state(struct 
amdgpu_device *adev,
                                          state == AMDGPU_IRQ_STATE_ENABLE ? 1 
: 0);
                WREG32(reg_offset, sdma_cntl);
        }
+       amdgpu_gfx_off_ctrl(adev, true);
 
        return 0;
 }
-- 
2.52.0

Reply via email to