6.18-stable patches

added patches:
	drm-amdgpu-don-t-attach-the-tlb-fence-for-si.patch

diff --git a/queue-6.18/drm-amdgpu-don-t-attach-the-tlb-fence-for-si.patch b/queue-6.18/drm-amdgpu-don-t-attach-the-tlb-fence-for-si.patch
new file mode 100644 (file)
index 0000000..4770f08
--- /dev/null
+++ b/queue-6.18/drm-amdgpu-don-t-attach-the-tlb-fence-for-si.patch
@@ -0,0 +1,39 @@
+From eb296c09805ee37dd4ea520a7fb3ec157c31090f Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Tue, 2 Dec 2025 14:24:03 -0500
+Subject: 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: Alex Deucher <alexander.deucher@amd.com>
+
+commit eb296c09805ee37dd4ea520a7fb3ec157c31090f upstream.
+
+SI hardware doesn't support pasids, user mode queues, or
+KIQ/MES so there is no need for this.  Doing so results in
+a segfault as these callbacks are non-existent for SI.
+
+Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/4744
+Fixes: f3854e04b708 ("drm/amdgpu: attach tlb fence to the PTs update")
+Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+(cherry picked from commit 820b3d376e8a102c6aeab737ec6edebbbb710e04)
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+@@ -1066,7 +1066,9 @@ amdgpu_vm_tlb_flush(struct amdgpu_vm_upd
+       }
+ 
+       /* Prepare a TLB flush fence to be attached to PTs */
+-      if (!params->unlocked) {
++      if (!params->unlocked &&
++          /* SI doesn't support pasid or KIQ/MES */
++          params->adev->family > AMDGPU_FAMILY_SI) {
+               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 60388b54c41cbc663d964229c83c6576b044f171..4ec671d6138a42fbac4fc24a50d8bd965aaca65b 100644 (file)
--- a/queue-6.18/series
+++ b/queue-6.18/series
@@ -8,3 +8,4 @@ mm-huge_memory-merge-uniform_split_supported-and-non_uniform_split_supported.pat
 kvm-s390-fix-gmap_helper_zap_one_page-again.patch
 drm-edid-add-drm_edid_ident_init-to-initialize-struct-drm_edid_ident.patch
 drm-displayid-add-quirk-to-ignore-displayid-checksum-errors.patch
+drm-amdgpu-don-t-attach-the-tlb-fence-for-si.patch