6.1-stable patches

added patches:
	drm-amdgpu-handle-null-bo-tbo.resource-again-in-amdgpu_vm_bo_update.patch

diff --git a/queue-6.1/drm-amdgpu-handle-null-bo-tbo.resource-again-in-amdgpu_vm_bo_update.patch b/queue-6.1/drm-amdgpu-handle-null-bo-tbo.resource-again-in-amdgpu_vm_bo_update.patch
new file mode 100644 (file)
index 0000000..5dc689f
--- /dev/null
+++ b/queue-6.1/drm-amdgpu-handle-null-bo-tbo.resource-again-in-amdgpu_vm_bo_update.patch
@@ -0,0 +1,42 @@
+From 85230ee36d88e7a09fb062d43203035659dd10a5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mdaenzer@redhat.com>
+Date: Tue, 17 Dec 2024 18:22:56 +0100
+Subject: drm/amdgpu: Handle NULL bo->tbo.resource (again) in amdgpu_vm_bo_update
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Michel Dänzer <mdaenzer@redhat.com>
+
+commit 85230ee36d88e7a09fb062d43203035659dd10a5 upstream.
+
+Third time's the charm, I hope?
+
+Fixes: d3116756a710 ("drm/ttm: rename bo->mem and make it a pointer")
+Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3837
+Reviewed-by: Christian König <christian.koenig@amd.com>
+Signed-off-by: Michel Dänzer <mdaenzer@redhat.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+(cherry picked from commit 695c2c745e5dff201b75da8a1d237ce403600d04)
+Cc: stable@vger.kernel.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c |    7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+@@ -1060,10 +1060,9 @@ int amdgpu_vm_bo_update(struct amdgpu_de
+        * next command submission.
+        */
+       if (bo && bo->tbo.base.resv == vm->root.bo->tbo.base.resv) {
+-              uint32_t mem_type = bo->tbo.resource->mem_type;
+-
+-              if (!(bo->preferred_domains &
+-                    amdgpu_mem_type_to_domain(mem_type)))
++              if (bo->tbo.resource &&
++                  !(bo->preferred_domains &
++                    amdgpu_mem_type_to_domain(bo->tbo.resource->mem_type)))
+                       amdgpu_vm_bo_evicted(&bo_va->base);
+               else
+                       amdgpu_vm_bo_idle(&bo_va->base);

diff --git a/queue-6.1/series b/queue-6.1/series
index 5c5a696bb50b06fa50c4195996a78a1517575f0b..022e42e897adcc142b4cab2b2fc5c5f33a7aa20c 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -80,3 +80,4 @@ io_uring-rw-split-io_read-into-a-helper.patch
 io_uring-rw-treat-eopnotsupp-for-iocb_nowait-like-eagain.patch
 io_uring-rw-avoid-punting-to-io-wq-directly.patch
 dt-bindings-net-fec-add-pps-channel-property.patch
+drm-amdgpu-handle-null-bo-tbo.resource-again-in-amdgpu_vm_bo_update.patch