drop some drm patches from 4.14 and 4.19

diff --git a/queue-4.14/drm-amdgpu-fix-clearing-mappings-for-bos-that-are-always-valid-in-vm.patch b/queue-4.14/drm-amdgpu-fix-clearing-mappings-for-bos-that-are-always-valid-in-vm.patch
deleted file mode 100644 (file)
index 267d772..0000000
--- a/queue-4.14/drm-amdgpu-fix-clearing-mappings-for-bos-that-are-always-valid-in-vm.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From ea2c3c08554601b051d91403a241266e1cf490a5 Mon Sep 17 00:00:00 2001
-From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
-Date: Fri, 16 Jun 2023 15:14:07 +0200
-Subject: drm/amdgpu: fix clearing mappings for BOs that are always valid in VM
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
-
-commit ea2c3c08554601b051d91403a241266e1cf490a5 upstream.
-
-Per VM BOs must be marked as moved or otherwise their ranges are not
-updated on use which might be necessary when the replace operation
-splits mappings.
-
-This fixes random GPU hangs when replacing sparse mappings from the
-userspace, while OP_MAP/OP_UNMAP works fine because always valid BOs
-are correctly handled there.
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.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_vm.c |   12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
-@@ -2312,18 +2312,30 @@ int amdgpu_vm_bo_clear_mappings(struct a
- 
-       /* Insert partial mapping before the range */
-       if (!list_empty(&before->list)) {
-+              struct amdgpu_bo *bo = before->bo_va->base.bo;
-+
-               amdgpu_vm_it_insert(before, &vm->va);
-               if (before->flags & AMDGPU_PTE_PRT)
-                       amdgpu_vm_prt_get(adev);
-+
-+              if (bo && bo->tbo.base.resv == vm->root.bo->tbo.base.resv &&
-+                  !before->bo_va->base.moved)
-+                      amdgpu_vm_bo_moved(&before->bo_va->base);
-       } else {
-               kfree(before);
-       }
- 
-       /* Insert partial mapping after the range */
-       if (!list_empty(&after->list)) {
-+              struct amdgpu_bo *bo = after->bo_va->base.bo;
-+
-               amdgpu_vm_it_insert(after, &vm->va);
-               if (after->flags & AMDGPU_PTE_PRT)
-                       amdgpu_vm_prt_get(adev);
-+
-+              if (bo && bo->tbo.base.resv == vm->root.bo->tbo.base.resv &&
-+                  !after->bo_va->base.moved)
-+                      amdgpu_vm_bo_moved(&after->bo_va->base);
-       } else {
-               kfree(after);
-       }

diff --git a/queue-4.14/series b/queue-4.14/series
index ce1b1f7b639f8806f44f7d2e4ec32efca7e745ee..86650b5f57f335e772d6f4aca13b21cc9ba93bea 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -110,5 +110,4 @@ pci-add-function-1-dma-alias-quirk-for-marvell-88se9235.patch
 misc-pci_endpoint_test-re-init-completion-for-every-test.patch
 md-raid0-add-discard-support-for-the-original-layout.patch
 fs-dlm-return-positive-pid-value-for-f_getlk.patch
-drm-amdgpu-fix-clearing-mappings-for-bos-that-are-always-valid-in-vm.patch
 serial-atmel-don-t-enable-irqs-prematurely.patch

diff --git a/queue-4.19/drm-amdgpu-fix-clearing-mappings-for-bos-that-are-always-valid-in-vm.patch b/queue-4.19/drm-amdgpu-fix-clearing-mappings-for-bos-that-are-always-valid-in-vm.patch
deleted file mode 100644 (file)
index 74c019b..0000000
--- a/queue-4.19/drm-amdgpu-fix-clearing-mappings-for-bos-that-are-always-valid-in-vm.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From ea2c3c08554601b051d91403a241266e1cf490a5 Mon Sep 17 00:00:00 2001
-From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
-Date: Fri, 16 Jun 2023 15:14:07 +0200
-Subject: drm/amdgpu: fix clearing mappings for BOs that are always valid in VM
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
-
-commit ea2c3c08554601b051d91403a241266e1cf490a5 upstream.
-
-Per VM BOs must be marked as moved or otherwise their ranges are not
-updated on use which might be necessary when the replace operation
-splits mappings.
-
-This fixes random GPU hangs when replacing sparse mappings from the
-userspace, while OP_MAP/OP_UNMAP works fine because always valid BOs
-are correctly handled there.
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.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_vm.c |   12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
-@@ -2315,18 +2315,30 @@ int amdgpu_vm_bo_clear_mappings(struct a
- 
-       /* Insert partial mapping before the range */
-       if (!list_empty(&before->list)) {
-+              struct amdgpu_bo *bo = before->bo_va->base.bo;
-+
-               amdgpu_vm_it_insert(before, &vm->va);
-               if (before->flags & AMDGPU_PTE_PRT)
-                       amdgpu_vm_prt_get(adev);
-+
-+              if (bo && bo->tbo.base.resv == vm->root.bo->tbo.base.resv &&
-+                  !before->bo_va->base.moved)
-+                      amdgpu_vm_bo_moved(&before->bo_va->base);
-       } else {
-               kfree(before);
-       }
- 
-       /* Insert partial mapping after the range */
-       if (!list_empty(&after->list)) {
-+              struct amdgpu_bo *bo = after->bo_va->base.bo;
-+
-               amdgpu_vm_it_insert(after, &vm->va);
-               if (after->flags & AMDGPU_PTE_PRT)
-                       amdgpu_vm_prt_get(adev);
-+
-+              if (bo && bo->tbo.base.resv == vm->root.bo->tbo.base.resv &&
-+                  !after->bo_va->base.moved)
-+                      amdgpu_vm_bo_moved(&after->bo_va->base);
-       } else {
-               kfree(after);
-       }

diff --git a/queue-4.19/series b/queue-4.19/series
index 81be8cf040fdd6bb68883d8aaa3857ef3931553d..77e05e2b8298ecb9de9e9c50982450e420a8a6fc 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -172,6 +172,5 @@ misc-pci_endpoint_test-free-irqs-before-removing-the-device.patch
 misc-pci_endpoint_test-re-init-completion-for-every-test.patch
 md-raid0-add-discard-support-for-the-original-layout.patch
 fs-dlm-return-positive-pid-value-for-f_getlk.patch
-drm-amdgpu-fix-clearing-mappings-for-bos-that-are-always-valid-in-vm.patch
 drm-amd-display-add-monitor-specific-edid-quirk.patch
 serial-atmel-don-t-enable-irqs-prematurely.patch