Commit 90fb8779 authored by Alex Deucher's avatar Alex Deucher

drm/radeon: halt engines before disabling MC (cayman/TN)

It's better to halt the engines before we disable the MC.
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b21b6e7a
...@@ -1405,13 +1405,6 @@ static void cayman_gpu_soft_reset(struct radeon_device *rdev, u32 reset_mask) ...@@ -1405,13 +1405,6 @@ static void cayman_gpu_soft_reset(struct radeon_device *rdev, u32 reset_mask)
dev_info(rdev->dev, " VM_CONTEXT1_PROTECTION_FAULT_STATUS 0x%08X\n", dev_info(rdev->dev, " VM_CONTEXT1_PROTECTION_FAULT_STATUS 0x%08X\n",
RREG32(0x14DC)); RREG32(0x14DC));
r600_set_bios_scratch_engine_hung(rdev, true);
evergreen_mc_stop(rdev, &save);
if (evergreen_mc_wait_for_idle(rdev)) {
dev_warn(rdev->dev, "Wait for MC idle timedout !\n");
}
/* Disable CP parsing/prefetching */ /* Disable CP parsing/prefetching */
WREG32(CP_ME_CNTL, CP_ME_HALT | CP_PFP_HALT); WREG32(CP_ME_CNTL, CP_ME_HALT | CP_PFP_HALT);
...@@ -1429,6 +1422,13 @@ static void cayman_gpu_soft_reset(struct radeon_device *rdev, u32 reset_mask) ...@@ -1429,6 +1422,13 @@ static void cayman_gpu_soft_reset(struct radeon_device *rdev, u32 reset_mask)
WREG32(DMA_RB_CNTL + DMA1_REGISTER_OFFSET, tmp); WREG32(DMA_RB_CNTL + DMA1_REGISTER_OFFSET, tmp);
} }
udelay(50);
evergreen_mc_stop(rdev, &save);
if (evergreen_mc_wait_for_idle(rdev)) {
dev_warn(rdev->dev, "Wait for MC idle timedout !\n");
}
if (reset_mask & (RADEON_RESET_GFX | RADEON_RESET_COMPUTE)) { if (reset_mask & (RADEON_RESET_GFX | RADEON_RESET_COMPUTE)) {
grbm_soft_reset = SOFT_RESET_CB | grbm_soft_reset = SOFT_RESET_CB |
SOFT_RESET_DB | SOFT_RESET_DB |
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment