summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2013-01-31 09:00:52 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-02-11 08:47:17 -0800
commit36509fceeabafd1a6e95e48ae75efe020fa59937 (patch)
treeeff15f3dd94b4bc078ad4a991a4f58e5e240deb1
parentb0cc9fb10c1b7240b229b40391f8da2a987995bd (diff)
downloadlinux-3.10-36509fceeabafd1a6e95e48ae75efe020fa59937.tar.gz
linux-3.10-36509fceeabafd1a6e95e48ae75efe020fa59937.tar.bz2
linux-3.10-36509fceeabafd1a6e95e48ae75efe020fa59937.zip
drm/radeon/evergreen+: wait for the MC to settle after MC blackout
commit ed39fadd6df01095378e499fac3674883f16b853 upstream. Some chips seem to need a little delay after blacking out the MC before the requests actually stop. May fix: https://bugs.freedesktop.org/show_bug.cgi?id=56139 https://bugs.freedesktop.org/show_bug.cgi?id=57567 Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/gpu/drm/radeon/evergreen.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
index 4a1d8f3457c..e664e0414c6 100644
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -1179,6 +1179,8 @@ void evergreen_mc_stop(struct radeon_device *rdev, struct evergreen_mc_save *sav
blackout &= ~BLACKOUT_MODE_MASK;
WREG32(MC_SHARED_BLACKOUT_CNTL, blackout | 1);
}
+ /* wait for the MC to settle */
+ udelay(100);
}
void evergreen_mc_resume(struct radeon_device *rdev, struct evergreen_mc_save *save)