From: Greg Kroah-Hartman Date: Mon, 23 Dec 2024 15:52:59 +0000 (+0100) Subject: 6.6-stable patches X-Git-Tag: v6.1.122~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fa556bf1145d279c5a86ec991e723d89a624cd94;p=thirdparty%2Fkernel%2Fstable-queue.git 6.6-stable patches added patches: drm-amdgpu-handle-null-bo-tbo.resource-again-in-amdgpu_vm_bo_update.patch --- diff --git a/queue-6.6/drm-amdgpu-handle-null-bo-tbo.resource-again-in-amdgpu_vm_bo_update.patch b/queue-6.6/drm-amdgpu-handle-null-bo-tbo.resource-again-in-amdgpu_vm_bo_update.patch new file mode 100644 index 00000000000..866159cc7e6 --- /dev/null +++ b/queue-6.6/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?= +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 + +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 +Signed-off-by: Michel Dänzer +Signed-off-by: Alex Deucher +(cherry picked from commit 695c2c745e5dff201b75da8a1d237ce403600d04) +Cc: stable@vger.kernel.org +Signed-off-by: Greg Kroah-Hartman +--- + 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 +@@ -1161,10 +1161,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.6/series b/queue-6.6/series index ad62a10b37f..17612ceccfd 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -113,3 +113,4 @@ io_uring-rw-treat-eopnotsupp-for-iocb_nowait-like-eagain.patch io_uring-rw-avoid-punting-to-io-wq-directly.patch net-fec-refactor-pps-channel-configuration.patch net-fec-make-pps-channel-configurable.patch +drm-amdgpu-handle-null-bo-tbo.resource-again-in-amdgpu_vm_bo_update.patch