From 46d09fe2b84f8139dd27db965fc1228425c2552b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 4 Dec 2025 17:15:49 +0100 Subject: [PATCH] drop queue-6.12/drm-amdgpu-attach-tlb-fence-to-the-pts-update.patch --- ...u-attach-tlb-fence-to-the-pts-update.patch | 38 ------------------- queue-6.12/series | 1 - 2 files changed, 39 deletions(-) delete mode 100644 queue-6.12/drm-amdgpu-attach-tlb-fence-to-the-pts-update.patch diff --git a/queue-6.12/drm-amdgpu-attach-tlb-fence-to-the-pts-update.patch b/queue-6.12/drm-amdgpu-attach-tlb-fence-to-the-pts-update.patch deleted file mode 100644 index 558d75c2ae..0000000000 --- a/queue-6.12/drm-amdgpu-attach-tlb-fence-to-the-pts-update.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b4a7f4e7ad2b120a94f3111f92a11520052c762d Mon Sep 17 00:00:00 2001 -From: Prike Liang -Date: Fri, 31 Oct 2025 17:02:51 +0800 -Subject: drm/amdgpu: attach tlb fence to the PTs update -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Prike Liang - -commit b4a7f4e7ad2b120a94f3111f92a11520052c762d upstream. - -Ensure the userq TLB flush is emitted only after -the VM update finishes and the PT BOs have been -annotated with bookkeeping fences. - -Suggested-by: Christian König -Signed-off-by: Prike Liang -Reviewed-by: Christian König -Signed-off-by: Alex Deucher -(cherry picked from commit f3854e04b708d73276c4488231a8bd66d30b4671) -Cc: stable@vger.kernel.org -Signed-off-by: Greg Kroah-Hartman ---- - drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c -@@ -917,7 +917,7 @@ amdgpu_vm_tlb_flush(struct amdgpu_vm_upd - } - - /* Prepare a TLB flush fence to be attached to PTs */ -- if (!params->unlocked && vm->is_compute_context) { -+ if (!params->unlocked) { - amdgpu_vm_tlb_fence_create(params->adev, vm, fence); - - /* Makes sure no PD/PT is freed before the flush */ diff --git a/queue-6.12/series b/queue-6.12/series index 4d697d2467..96b93f84ed 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -101,7 +101,6 @@ xhci-dbgtty-fix-device-unregister.patch usb-serial-ftdi_sio-add-support-for-u-blox-evk-m101.patch usb-serial-option-add-support-for-rolling-rw101r-gl.patch drm-sti-fix-device-leaks-at-component-probe.patch -drm-amdgpu-attach-tlb-fence-to-the-pts-update.patch drm-amd-amdgpu-reserve-vm-invalidation-engine-for-uni_mes.patch drm-amd-display-check-null-before-accessing.patch drm-amd-display-don-t-change-brightness-for-disabled-connectors.patch -- 2.47.3