drop broken 4.14 amdgpu patch

diff --git a/queue-4.14/drm-amdgpu-fix-clear_all-and-replace-handling-in-the-vm-v2.patch b/queue-4.14/drm-amdgpu-fix-clear_all-and-replace-handling-in-the-vm-v2.patch
deleted file mode 100644 (file)
index 4fd4ffb..0000000
--- a/queue-4.14/drm-amdgpu-fix-clear_all-and-replace-handling-in-the-vm-v2.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 387f49e5467244b7bcb4cad0946a5d0fcade5f92 Mon Sep 17 00:00:00 2001
-From: Junwei Zhang <Jerry.Zhang@amd.com>
-Date: Tue, 5 Jun 2018 17:31:51 +0800
-Subject: drm/amdgpu: fix clear_all and replace handling in the VM (v2)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Junwei Zhang <Jerry.Zhang@amd.com>
-
-commit 387f49e5467244b7bcb4cad0946a5d0fcade5f92 upstream.
-
-v2: assign bo_va as well
-
-We need to put the lose ends on the invalid list because it is possible
-that we need to split up huge pages for them.
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Christian König <christian.koenig@amd.com>
-Signed-off-by: Junwei Zhang <Jerry.Zhang@amd.com> (v2)
-Reviewed-by: David Zhou <david1.zhou@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c |    6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
-@@ -2277,7 +2277,8 @@ int amdgpu_vm_bo_clear_mappings(struct a
-                       before->last = saddr - 1;
-                       before->offset = tmp->offset;
-                       before->flags = tmp->flags;
--                      list_add(&before->list, &tmp->list);
-+                      before->bo_va = tmp->bo_va;
-+                      list_add(&before->list, &tmp->bo_va->invalids);
-               }
- 
-               /* Remember mapping split at the end */
-@@ -2287,7 +2288,8 @@ int amdgpu_vm_bo_clear_mappings(struct a
-                       after->offset = tmp->offset;
-                       after->offset += after->start - tmp->start;
-                       after->flags = tmp->flags;
--                      list_add(&after->list, &tmp->list);
-+                      after->bo_va = tmp->bo_va;
-+                      list_add(&after->list, &tmp->bo_va->invalids);
-               }
- 
-               list_del(&tmp->list);

diff --git a/queue-4.14/series b/queue-4.14/series
index 7ff71a47441e7a0db0b63fc9dbb527fcdcecdc04..089284f03c6b3bb4fdb185570398b4272da1cfb1 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -16,4 +16,3 @@ vt-prevent-leaking-uninitialized-data-to-userspace-via-dev-vcs.patch
 drm-amdgpu-add-apu-support-in-vi_set_uvd_clocks.patch
 drm-amdgpu-add-apu-support-in-vi_set_vce_clocks.patch
 drm-amdgpu-fix-the-missed-vcn-fw-version-report.patch
-drm-amdgpu-fix-clear_all-and-replace-handling-in-the-vm-v2.patch