summaryrefslogtreecommitdiff
path: root/drivers
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 09:04:42 -0800
commit83f83a00c02e221cb9b433e184990666111685cd (patch)
tree0fd1155044006bb2a1b2be39989d0e902b259c93 /drivers
parent9cf4086a08c444f2455f0bdd13b9d545e7c7d1fa (diff)
downloadlwn-83f83a00c02e221cb9b433e184990666111685cd.tar.gz
lwn-83f83a00c02e221cb9b433e184990666111685cd.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>
Diffstat (limited to 'drivers')
-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 18a5382af672..24c5f0ba8967 100644
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -1345,6 +1345,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)