drop 4.14 broken patch

diff --git a/queue-4.14/drm-amdgpu-reserve-vm-root-shared-fence-slot-for-command-submission-v3.patch b/queue-4.14/drm-amdgpu-reserve-vm-root-shared-fence-slot-for-command-submission-v3.patch
deleted file mode 100644 (file)
index 5137bc5..0000000
--- a/queue-4.14/drm-amdgpu-reserve-vm-root-shared-fence-slot-for-command-submission-v3.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From ed6b4b5559769c6c5a0fcb3fac8a9e1f4e58c4ae Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com>
-Date: Mon, 25 Jun 2018 11:07:17 +0200
-Subject: drm/amdgpu: Reserve VM root shared fence slot for command submission (v3)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Michel Dänzer <michel.daenzer@amd.com>
-
-commit ed6b4b5559769c6c5a0fcb3fac8a9e1f4e58c4ae upstream.
-
-Without this, there could not be enough slots, which could trigger the
-BUG_ON in reservation_object_add_shared_fence.
-
-v2:
-* Jump to the error label instead of returning directly (Jerry Zhang)
-v3:
-* Reserve slots for command submission after VM updates (Christian König)
-
-Cc: stable@vger.kernel.org
-Bugzilla: https://bugs.freedesktop.org/106418
-Reported-by: mikhail.v.gavrilov@gmail.com
-Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
-Signed-off-by: Junwei Zhang <Jerry.Zhang@amd.com>
-Reviewed-by: Christian König <christian.koenig@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_cs.c |    4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
-@@ -869,6 +869,10 @@ static int amdgpu_cs_ib_vm_chunk(struct
-               r = amdgpu_bo_vm_update_pte(p);
-               if (r)
-                       return r;
-+
-+              r = reservation_object_reserve_shared(vm->root.base.bo->tbo.resv);
-+              if (r)
-+                      return r;
-       }
- 
-       return amdgpu_cs_sync_rings(p);

diff --git a/queue-4.14/series b/queue-4.14/series
index d9837499d85a1b5afdc3ccb80238f7a114054b99..6fb44736f594f831f8404d96a26aee886f564b0b 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -17,7 +17,6 @@ cpufreq-intel_pstate-register-when-acpi-pcch-is-present.patch
 vfio-pci-fix-potential-spectre-v1.patch
 vfio-spapr-use-iommu-pageshift-rather-than-pagesize.patch
 stop_machine-disable-preemption-when-waking-two-stopper-threads.patch
-drm-amdgpu-reserve-vm-root-shared-fence-slot-for-command-submission-v3.patch
 drm-i915-fix-hotplug-irq-ack-on-i965-g4x.patch
 drm-nouveau-use-drm_connector_list_iter_-for-iterating-connectors.patch
 drm-nouveau-avoid-looping-through-fake-mst-connectors.patch