From af7f59b585acd3417e35e09ecdba318603b594bb Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 5 Feb 2026 15:14:00 +0100 Subject: [PATCH] drop amd patch --- ...n-up-kfd-node-on-surprise-disconnect.patch | 46 ------------------- queue-5.15/series | 1 - ...n-up-kfd-node-on-surprise-disconnect.patch | 46 ------------------- queue-6.1/series | 1 - 4 files changed, 94 deletions(-) delete mode 100644 queue-5.15/drm-amd-clean-up-kfd-node-on-surprise-disconnect.patch delete mode 100644 queue-6.1/drm-amd-clean-up-kfd-node-on-surprise-disconnect.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 index 3c78b44a76..0000000000 --- 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)" -Date: Wed, 7 Jan 2026 15:37:28 -0600 -Subject: drm/amd: Clean up kfd node on surprise disconnect - -From: Mario Limonciello (AMD) - -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) -Reviewed-by: Kent Russell -Signed-off-by: Alex Deucher -(cherry picked from commit 6a23e7b4332c10f8b56c33a9c5431b52ecff9aab) -Cc: stable@vger.kernel.org -Signed-off-by: Greg Kroah-Hartman ---- - 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 e8a9c44e0e..15cd3f9f5a 100644 --- 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 index 64018dca0c..0000000000 --- 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)" -Date: Wed, 7 Jan 2026 15:37:28 -0600 -Subject: drm/amd: Clean up kfd node on surprise disconnect - -From: Mario Limonciello (AMD) - -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) -Reviewed-by: Kent Russell -Signed-off-by: Alex Deucher -(cherry picked from commit 6a23e7b4332c10f8b56c33a9c5431b52ecff9aab) -Cc: stable@vger.kernel.org -Signed-off-by: Greg Kroah-Hartman ---- - 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 716e71fce9..0c47a635d7 100644 --- 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 -- 2.47.3