summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2017-06-02 12:22:23 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2017-06-02 12:22:23 -0400
commitd635cafc6ede311a26c8e358dcc5dfa3592d9815 (patch)
tree107eeb8261263759f38e2dcafe0a577fe85389d6
parentc27b17d0c1f0b850c87a8359df3e6761052cc484 (diff)
downloadlongterm-queue-4.8-d635cafc6ede311a26c8e358dcc5dfa3592d9815.tar.gz
drm: remove patch for post 4.8 driver
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--queue/drm-amdgpu-reinstate-oland-workaround-for-sclk.patch38
-rw-r--r--queue/series1
2 files changed, 0 insertions, 39 deletions
diff --git a/queue/drm-amdgpu-reinstate-oland-workaround-for-sclk.patch b/queue/drm-amdgpu-reinstate-oland-workaround-for-sclk.patch
deleted file mode 100644
index c2dd278..0000000
--- a/queue/drm-amdgpu-reinstate-oland-workaround-for-sclk.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e11ddff68a7c455e63c4b46154a3e75c699a7b55 Mon Sep 17 00:00:00 2001
-From: Alex Deucher <alexander.deucher@amd.com>
-Date: Wed, 15 Mar 2017 21:13:25 -0400
-Subject: [PATCH] drm/amdgpu: reinstate oland workaround for sclk
-
-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>
-Cc: stable@vger.kernel.org
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/si_dpm.c b/drivers/gpu/drm/amd/amdgpu/si_dpm.c
-index 33b504bafb88..c5dec210d529 100644
---- a/drivers/gpu/drm/amd/amdgpu/si_dpm.c
-+++ b/drivers/gpu/drm/amd/amdgpu/si_dpm.c
-@@ -3465,9 +3465,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;
- }
- }
---
-2.12.0
-
diff --git a/queue/series b/queue/series
index 3ddecef..5c637e4 100644
--- a/queue/series
+++ b/queue/series
@@ -80,7 +80,6 @@ arm64-kaslr-Fix-up-the-kernel-image-alignment.patch
cpufreq-Restore-policy-min-max-limits-on-CPU-online.patch
cgroup-net_cls-iterate-the-fds-of-only-the-tasks-whi.patch
blk-mq-don-t-complete-un-started-request-in-timeout-.patch
-drm-amdgpu-reinstate-oland-workaround-for-sclk.patch
intel_th-Don-t-leak-module-refcount-on-failure-to-ac.patch
Drivers-hv-vmbus-Don-t-leak-channel-ids.patch
libceph-don-t-set-weight-to-IN-when-OSD-is-destroyed.patch