drm/amdgpu: reinstate oland workaround for sclk

BugLink: http://bugs.launchpad.net/bugs/1677589
commit e11ddff68a7c455e63c4b46154a3e75c699a7b55 upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/si_dpm.c b/drivers/gpu/drm/amd/amdgpu/si_dpm.c
index 9a5ccae06b6c9c528bbb387dec0c806411a23167..054c9c29536dd5149570c703866c59bb5adadeed 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/si_dpm.c
+++ b/drivers/gpu/drm/amd/amdgpu/si_dpm.c
@@ -3498,9 +3498,13 @@ static void si_apply_state_adjust_rules(struct amdgpu_device *adev,
                        max_sclk = 75000;
                }
        } else if (adev->asic_type == CHIP_OLAND) {
-               if ((adev->pdev->device == 0x6604) &&
-                   (adev->pdev->subsystem_vendor == 0x1028) &&
-                   (adev->pdev->subsystem_device == 0x066F)) {
+               if ((adev->pdev->revision == 0xC7) ||
+                   (adev->pdev->revision == 0x80) ||
+                   (adev->pdev->revision == 0x81) ||
+                   (adev->pdev->revision == 0x83) ||
+                   (adev->pdev->revision == 0x87) ||
+                   (adev->pdev->device == 0x6604) ||
+                   (adev->pdev->device == 0x6605)) {
                        max_sclk = 75000;
                }
        }