drop broken drm patch from 4.9 and 4.14

diff --git a/queue-4.9/drm-amdgpu-powerplay-apply-avfs-cks-off-voltages-on-vi.patch b/queue-4.9/drm-amdgpu-powerplay-apply-avfs-cks-off-voltages-on-vi.patch
deleted file mode 100644 (file)
index d5b0dba..0000000
--- a/queue-4.9/drm-amdgpu-powerplay-apply-avfs-cks-off-voltages-on-vi.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From cf4197ed5796234a53beb71228198c7d1e678947 Mon Sep 17 00:00:00 2001
-From: Kenneth Feng <kenneth.feng@amd.com>
-Date: Thu, 6 Dec 2018 11:56:14 +0800
-Subject: drm/amdgpu/powerplay: Apply avfs cks-off voltages on VI
-
-From: Kenneth Feng <kenneth.feng@amd.com>
-
-commit cf4197ed5796234a53beb71228198c7d1e678947 upstream.
-
-Instead of EVV cks-off voltages, avfs cks-off voltages can avoid
-the overshoot voltages when switching sclk.
-
-Signed-off-by: Kenneth Feng <kenneth.feng@amd.com>
-Acked-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Cc: stable@vger.kernel.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/gpu/drm/amd/powerplay/inc/smu7_ppsmc.h          |    2 ++
- drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c |    6 ++++++
- 2 files changed, 8 insertions(+)
-
---- a/drivers/gpu/drm/amd/powerplay/inc/smu7_ppsmc.h
-+++ b/drivers/gpu/drm/amd/powerplay/inc/smu7_ppsmc.h
-@@ -385,6 +385,8 @@ typedef uint16_t PPSMC_Result;
- #define PPSMC_MSG_AgmResetPsm                 ((uint16_t) 0x403)
- #define PPSMC_MSG_ReadVftCell                 ((uint16_t) 0x404)
- 
-+#define PPSMC_MSG_ApplyAvfsCksOffVoltage      ((uint16_t) 0x415)
-+
- #define PPSMC_MSG_GFX_CU_PG_ENABLE            ((uint16_t) 0x280)
- #define PPSMC_MSG_GFX_CU_PG_DISABLE           ((uint16_t) 0x281)
- #define PPSMC_MSG_GetCurrPkgPwr               ((uint16_t) 0x282)
---- a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c
-+++ b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c
-@@ -415,5 +415,11 @@ int polaris10_smum_init(struct pp_smumgr
-       smumgr->backend = polaris10_smu;
-       smumgr->smumgr_funcs = &polaris10_smu_funcs;
- 
-+      /* Apply avfs cks-off voltages to avoid the overshoot
-+       * when switching to the highest sclk frequency
-+       */
-+      if (data->apply_avfs_cks_off_voltage)
-+              smum_send_msg_to_smc(hwmgr, PPSMC_MSG_ApplyAvfsCksOffVoltage);
-+
-       return 0;
- }

diff --git a/queue-4.9/series b/queue-4.9/series
index f7a97c7a94b8eaf0793026d1fa88140df7a3664e..00de7273b96481ceb48a5226f446278fdea5b78b 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -14,4 +14,3 @@ tracing-fix-memory-leak-of-instance-function-hash-filters.patch
 powerpc-msi-fix-null-pointer-access-in-teardown-code.patch
 revert-drm-rockchip-allow-driver-to-be-shutdown-on-reboot-kexec.patch
 drm-i915-execlists-apply-a-full-mb-before-execution-for-braswell.patch
-drm-amdgpu-powerplay-apply-avfs-cks-off-voltages-on-vi.patch