summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Demers <alexandre.f.demers@gmail.com>2014-07-08 22:27:36 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-17 16:21:06 -0700
commit4a48d51d65f786ee8fe5b8aa18e8444dd746133d (patch)
tree8c006ae0058843d3aff1c8bd41947a218fdac3af
parent0e47bf3502607dfcb71e6a18fa4c8a576dbedb01 (diff)
downloadlinux-stable-4a48d51d65f786ee8fe5b8aa18e8444dd746133d.tar.gz
linux-stable-4a48d51d65f786ee8fe5b8aa18e8444dd746133d.tar.bz2
linux-stable-4a48d51d65f786ee8fe5b8aa18e8444dd746133d.zip
drm/radeon/dpm: Reenabling SS on Cayman
commit 41959341ac7e33dd360c7a881d13566f9eca37b2 upstream. It reverts commit c745fe611ca42295c9d91d8e305d27983e9132ef now that Cayman is stable since VDDCI fix. Spread spectrum was not the culprit. This depends on b0880e87c1fd038b84498944f52e52c3e86ebe59 (drm/radeon/dpm: fix vddci setup typo on cayman). Signed-off-by: Alexandre Demers <alexandre.f.demers@gmail.com> 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/rv770_dpm.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpu/drm/radeon/rv770_dpm.c b/drivers/gpu/drm/radeon/rv770_dpm.c
index b5f63f5e22a3..8fcb932a3a55 100644
--- a/drivers/gpu/drm/radeon/rv770_dpm.c
+++ b/drivers/gpu/drm/radeon/rv770_dpm.c
@@ -2332,12 +2332,6 @@ void rv770_get_engine_memory_ss(struct radeon_device *rdev)
pi->mclk_ss = radeon_atombios_get_asic_ss_info(rdev, &ss,
ASIC_INTERNAL_MEMORY_SS, 0);
- /* disable ss, causes hangs on some cayman boards */
- if (rdev->family == CHIP_CAYMAN) {
- pi->sclk_ss = false;
- pi->mclk_ss = false;
- }
-
if (pi->sclk_ss || pi->mclk_ss)
pi->dynamic_ss = true;
else