[PATCH AUTOSEL for 4.4 032/101] drm/radeon: reinstate oland workaround for sclk

[alexander . levin]

From: Alex Deucher 

[ 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 
Cc: sta...@vger.kernel.org
Signed-off-by: Sasha Levin 
---
 drivers/gpu/drm/radeon/si_dpm.c | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c
index c42430bd3ac2..d9007cc37be1 100644
--- a/drivers/gpu/drm/radeon/si_dpm.c
+++ b/drivers/gpu/drm/radeon/si_dpm.c
@@ -3030,9 +3030,13 @@ static void si_apply_state_adjust_rules(struct 
radeon_device *rdev,
max_mclk = 8;
}
} 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;
}
}
-- 
2.11.0

[PATCH AUTOSEL for 4.4 032/101] drm/radeon: reinstate oland workaround for sclk

[alexander . levin]

From: Alex Deucher 

[ 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 
Cc: sta...@vger.kernel.org
Signed-off-by: Sasha Levin 
---
 drivers/gpu/drm/radeon/si_dpm.c | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c
index c42430bd3ac2..d9007cc37be1 100644
--- a/drivers/gpu/drm/radeon/si_dpm.c
+++ b/drivers/gpu/drm/radeon/si_dpm.c
@@ -3030,9 +3030,13 @@ static void si_apply_state_adjust_rules(struct 
radeon_device *rdev,
max_mclk = 8;
}
} 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;
}
}
-- 
2.11.0