FAILED: patch "[PATCH] drm/radeon: reinstate oland workaround for sclk" failed to apply to 4.10-stable tree

PATCH [email protected] 1 participant 1 message Mar 28, 2017

Subsystems (3)

Stable branch DRM drivers Radeon and amdgpu DRM drivers

lore

Share & tools

lore

[email protected]

author maintainer

2017-03-28 10:53 UTC #0 lore raw

The patch below does not apply to the 4.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 66822d815ae61ecb2d9dba9031517e8a8476969d Mon Sep 17 00:00:00 2001

From: Alex Deucher <[email protected]>
Date: Wed, 15 Mar 2017 21:11:46 -0400
Subject: [PATCH] drm/radeon: reinstate oland workaround for sclk

Higher sclks seem to be unstable on some boards.

bug https://bugs.freedesktop.org/show_bug.cgi?id=100222

Signed-off-by Alex Deucher <[email protected]>

Cc [email protected]

drivers/gpu/drm/radeon/si_dpm.c +7 -3

index 72e1588580a1..c7af9fdd20c7 100644
@@ -2985,9 +2985,13 @@ static void si_apply_state_adjust_rules(struct radeon_device *rdev,
 			max_sclk = 75000;
 		}
 	} 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;
 		}
 	}