From: Alex Deucher Date: Wed, 23 Jan 2013 23:56:08 +0000 (-0500) Subject: drm/radeon: halt engines before disabling MC (6xx/7xx) X-Git-Tag: MMI-PSA29.97-13-9~14957^2~7^2~19 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ca57802e521de54341efc8a56f70571f79ffac72;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git drm/radeon: halt engines before disabling MC (6xx/7xx) It's better to halt the engines before we disable the MC. Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 997707b2a33e..abb143c0bdca 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -1397,11 +1397,6 @@ static void r600_gpu_soft_reset(struct radeon_device *rdev, u32 reset_mask) r600_print_gpu_status_regs(rdev); - rv515_mc_stop(rdev, &save); - if (r600_mc_wait_for_idle(rdev)) { - dev_warn(rdev->dev, "Wait for MC idle timedout !\n"); - } - /* Disable CP parsing/prefetching */ if (rdev->family >= CHIP_RV770) WREG32(R_0086D8_CP_ME_CNTL, S_0086D8_CP_ME_HALT(1) | S_0086D8_CP_PFP_HALT(1)); @@ -1420,6 +1415,11 @@ static void r600_gpu_soft_reset(struct radeon_device *rdev, u32 reset_mask) mdelay(50); + rv515_mc_stop(rdev, &save); + if (r600_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 (rdev->family >= CHIP_RV770) grbm_soft_reset |= S_008020_SOFT_RESET_DB(1) |