drop amd patch

diff --git a/queue-5.15/drm-amd-clean-up-kfd-node-on-surprise-disconnect.patch b/queue-5.15/drm-amd-clean-up-kfd-node-on-surprise-disconnect.patch
deleted file mode 100644 (file)
index 3c78b44..0000000
--- a/queue-5.15/drm-amd-clean-up-kfd-node-on-surprise-disconnect.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 28695ca09d326461f8078332aa01db516983e8a2 Mon Sep 17 00:00:00 2001
-From: "Mario Limonciello (AMD)" <superm1@kernel.org>
-Date: Wed, 7 Jan 2026 15:37:28 -0600
-Subject: drm/amd: Clean up kfd node on surprise disconnect
-
-From: Mario Limonciello (AMD) <superm1@kernel.org>
-
-commit 28695ca09d326461f8078332aa01db516983e8a2 upstream.
-
-When an eGPU is unplugged the KFD topology should also be destroyed
-for that GPU. This never happens because the fini_sw callbacks never
-get to run. Run them manually before calling amdgpu_device_ip_fini_early()
-when a device has already been disconnected.
-
-This location is intentionally chosen to make sure that the kfd locking
-refcount doesn't get incremented unintentionally.
-
-Cc: kent.russell@amd.com
-Closes: https://community.frame.work/t/amd-egpu-on-linux/8691/33
-Signed-off-by: Mario Limonciello (AMD) <superm1@kernel.org>
-Reviewed-by: Kent Russell <kent.russell@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-(cherry picked from commit 6a23e7b4332c10f8b56c33a9c5431b52ecff9aab)
-Cc: stable@vger.kernel.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c |    8 ++++++++
- 1 file changed, 8 insertions(+)
-
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
-@@ -3999,6 +3999,14 @@ void amdgpu_device_fini_hw(struct amdgpu
- 
-       amdgpu_irq_fini_hw(adev);
- 
-+      /*
-+       * device went through surprise hotplug; we need to destroy topology
-+       * before ip_fini_early to prevent kfd locking refcount issues by calling
-+       * amdgpu_amdkfd_suspend()
-+       */
-+      if (drm_dev_is_unplugged(adev_to_drm(adev)))
-+              amdgpu_amdkfd_device_fini_sw(adev);
-+
-       amdgpu_device_ip_fini_early(adev);
- 
-       amdgpu_gart_dummy_page_fini(adev);

diff --git a/queue-5.15/series b/queue-5.15/series
index e8a9c44e0e25401b22f1daaebdea36c02ab0ae80..15cd3f9f5a8bb211e11d9edc002dc039d96bc6cb 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -37,7 +37,6 @@ edac-i3200-fix-a-resource-leak-in-i3200_probe1.patch
 x86-resctrl-add-missing-resctrl-initialization-for-hygon.patch
 x86-resctrl-fix-memory-bandwidth-counter-width-for-hygon.patch
 mm-page_alloc-make-percpu_pagelist_high_fraction-reads-lock-free.patch
-drm-amd-clean-up-kfd-node-on-surprise-disconnect.patch
 drm-nouveau-disp-nv50-set-lock_core-in-curs507a_prepare.patch
 drm-panel-simple-fix-connector-type-for-dataimage-scf0700c48ggu18-panel.patch
 drm-vmwgfx-fix-an-error-return-check-in-vmw_compat_shader_add.patch

diff --git a/queue-6.1/drm-amd-clean-up-kfd-node-on-surprise-disconnect.patch b/queue-6.1/drm-amd-clean-up-kfd-node-on-surprise-disconnect.patch
deleted file mode 100644 (file)
index 64018dc..0000000
--- a/queue-6.1/drm-amd-clean-up-kfd-node-on-surprise-disconnect.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 28695ca09d326461f8078332aa01db516983e8a2 Mon Sep 17 00:00:00 2001
-From: "Mario Limonciello (AMD)" <superm1@kernel.org>
-Date: Wed, 7 Jan 2026 15:37:28 -0600
-Subject: drm/amd: Clean up kfd node on surprise disconnect
-
-From: Mario Limonciello (AMD) <superm1@kernel.org>
-
-commit 28695ca09d326461f8078332aa01db516983e8a2 upstream.
-
-When an eGPU is unplugged the KFD topology should also be destroyed
-for that GPU. This never happens because the fini_sw callbacks never
-get to run. Run them manually before calling amdgpu_device_ip_fini_early()
-when a device has already been disconnected.
-
-This location is intentionally chosen to make sure that the kfd locking
-refcount doesn't get incremented unintentionally.
-
-Cc: kent.russell@amd.com
-Closes: https://community.frame.work/t/amd-egpu-on-linux/8691/33
-Signed-off-by: Mario Limonciello (AMD) <superm1@kernel.org>
-Reviewed-by: Kent Russell <kent.russell@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-(cherry picked from commit 6a23e7b4332c10f8b56c33a9c5431b52ecff9aab)
-Cc: stable@vger.kernel.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c |    8 ++++++++
- 1 file changed, 8 insertions(+)
-
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
-@@ -4102,6 +4102,14 @@ void amdgpu_device_fini_hw(struct amdgpu
-       /* disable ras feature must before hw fini */
-       amdgpu_ras_pre_fini(adev);
- 
-+      /*
-+       * device went through surprise hotplug; we need to destroy topology
-+       * before ip_fini_early to prevent kfd locking refcount issues by calling
-+       * amdgpu_amdkfd_suspend()
-+       */
-+      if (drm_dev_is_unplugged(adev_to_drm(adev)))
-+              amdgpu_amdkfd_device_fini_sw(adev);
-+
-       amdgpu_device_ip_fini_early(adev);
- 
-       amdgpu_irq_fini_hw(adev);

diff --git a/queue-6.1/series b/queue-6.1/series
index 716e71fce939f8888ed87e5b00257a8406f2c8ee..0c47a635d7ee86bd9c9360e5975c2e8f0b77e089 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -58,7 +58,6 @@ x86-resctrl-fix-memory-bandwidth-counter-width-for-hygon.patch
 mm-page_alloc-make-percpu_pagelist_high_fraction-reads-lock-free.patch
 mm-damon-sysfs-cleanup-attrs-subdirs-on-context-dir-setup-failure.patch
 loongarch-fix-pmu-counter-allocation-for-mixed-type-event-groups.patch
-drm-amd-clean-up-kfd-node-on-surprise-disconnect.patch
 drm-nouveau-disp-nv50-set-lock_core-in-curs507a_prepare.patch
 drm-panel-simple-fix-connector-type-for-dataimage-scf0700c48ggu18-panel.patch
 drm-vmwgfx-fix-an-error-return-check-in-vmw_compat_shader_add.patch