summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2017-03-15 21:11:46 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-12-20 10:01:30 +0100
commit1e7f83cd53feb19a9bf7ca680ff2edf85647b692 (patch)
tree875b7ce6d84306e64b2a8b80285b6f94deca14d2
parent8a0c5968d934e59319ac109b673e3ce0d2aef193 (diff)
downloadlinux-stable-1e7f83cd53feb19a9bf7ca680ff2edf85647b692.tar.gz
linux-stable-1e7f83cd53feb19a9bf7ca680ff2edf85647b692.tar.bz2
linux-stable-1e7f83cd53feb19a9bf7ca680ff2edf85647b692.zip
drm/radeon: reinstate oland workaround for sclk
[ Upstream commit 66822d815ae61ecb2d9dba9031517e8a8476969d ] Higher sclks seem to be unstable on some boards. bug: https://bugs.freedesktop.org/show_bug.cgi?id=100222 Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org Signed-off-by: Sasha Levin <alexander.levin@verizon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/gpu/drm/radeon/si_dpm.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c
index e54d26e54c37..2113869e8678 100644
--- a/drivers/gpu/drm/radeon/si_dpm.c
+++ b/drivers/gpu/drm/radeon/si_dpm.c
@@ -2989,9 +2989,13 @@ static void si_apply_state_adjust_rules(struct radeon_device *rdev,
max_mclk = 80000;
}
} else if (rdev->family == CHIP_OLAND) {
- if ((rdev->pdev->device == 0x6604) &&
- (rdev->pdev->subsystem_vendor == 0x1028) &&
- (rdev->pdev->subsystem_device == 0x066F)) {
+ if ((rdev->pdev->revision == 0xC7) ||
+ (rdev->pdev->revision == 0x80) ||
+ (rdev->pdev->revision == 0x81) ||
+ (rdev->pdev->revision == 0x83) ||
+ (rdev->pdev->revision == 0x87) ||
+ (rdev->pdev->device == 0x6604) ||
+ (rdev->pdev->device == 0x6605)) {
max_sclk = 75000;
}
}