From b5bdf8d356ea5072d5543494c841272b5795b31f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 25 Feb 2026 06:44:50 -0800 Subject: [PATCH] 6.18-stable patches added patches: revert-drm-amdgpu-don-t-attach-the-tlb-fence-for-si.patch --- ...pu-don-t-attach-the-tlb-fence-for-si.patch | 42 +++++++++++++++++++ queue-6.18/series | 1 + 2 files changed, 43 insertions(+) create mode 100644 queue-6.18/revert-drm-amdgpu-don-t-attach-the-tlb-fence-for-si.patch diff --git a/queue-6.18/revert-drm-amdgpu-don-t-attach-the-tlb-fence-for-si.patch b/queue-6.18/revert-drm-amdgpu-don-t-attach-the-tlb-fence-for-si.patch new file mode 100644 index 0000000000..ecd74ff63e --- /dev/null +++ b/queue-6.18/revert-drm-amdgpu-don-t-attach-the-tlb-fence-for-si.patch @@ -0,0 +1,42 @@ +From 9163fe4d790fb4e16d6b0e23f55b43cddd3d4a65 Mon Sep 17 00:00:00 2001 +From: Prike Liang +Date: Fri, 9 Jan 2026 16:15:11 +0800 +Subject: Revert "drm/amdgpu: don't attach the tlb fence for SI" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Prike Liang + +commit 9163fe4d790fb4e16d6b0e23f55b43cddd3d4a65 upstream. + +This reverts commit 820b3d376e8a102c6aeab737ec6edebbbb710e04. + +It’s better to validate VM TLB flushes in the flush‑TLB backend +rather than in the generic VM layer. + +Reverting this patch depends on +commit fa7c231fc2b0 ("drm/amdgpu: validate the flush_gpu_tlb_pasid()") +being present in the tree. + +Signed-off-by: Prike Liang +Reviewed-by: Christian König +Signed-off-by: Alex Deucher +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +@@ -1066,9 +1066,7 @@ amdgpu_vm_tlb_flush(struct amdgpu_vm_upd + } + + /* Prepare a TLB flush fence to be attached to PTs */ +- if (!params->unlocked && +- /* SI doesn't support pasid or KIQ/MES */ +- params->adev->family > AMDGPU_FAMILY_SI) { ++ 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.18/series b/queue-6.18/series index 893d9ea88e..4e8ef61ced 100644 --- a/queue-6.18/series +++ b/queue-6.18/series @@ -640,3 +640,4 @@ selftests-bpf-test-bpf_skb_check_mtu-bpf_mtu_chk_segs-when-transport_header-is-n drm-amd-display-clear-hdmi-hpd-pending-work-only-if-it-is-enabled.patch net-stmmac-dwmac-loongson-set-clk_csr_i-to-100-150mhz.patch drm-amd-display-add-an-hdmi_hpd_debounce_delay_ms-module.patch +revert-drm-amdgpu-don-t-attach-the-tlb-fence-for-si.patch -- 2.47.3