FAILED: patch "[PATCH] drm/amdgpu: Forward VMID reservation errors" failed to apply to 6.12-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.12-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.12.y
git checkout FETCH_HEAD
git cherry-pick -x 8defb4f081a5feccc3ea8372d0c7af3522124e1f
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026010549-ensnare-embassy-d32e@gregkh' --subject-prefix 'PATCH 6.12.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 8defb4f081a5feccc3ea8372d0c7af3522124e1f Mon Sep 17 00:00:00 2001
From: Natalie Vock <[email protected]>
Date: Mon, 1 Dec 2025 12:52:38 -0500
Subject: [PATCH] drm/amdgpu: Forward VMID reservation errors
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Otherwise userspace may be fooled into believing it has a reserved VMID when in reality it doesn't, ultimately leading to GPU hangs when SPM is used.
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1 -2
@@ -2916,8 +2916,7 @@ int amdgpu_vm_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)switch (args->in.op) {case AMDGPU_VM_OP_RESERVE_VMID :/* We only have requirement to reserve vmid from gfxhub */ -amdgpu_vmid_alloc_reserved (adev, vm,AMDGPU_GFXHUB (0 )); -break ; +return amdgpu_vmid_alloc_reserved (adev, vm,AMDGPU_GFXHUB (0 ));case AMDGPU_VM_OP_UNRESERVE_VMID :amdgpu_vmid_free_reserved (adev, vm,AMDGPU_GFXHUB (0 ));break ;
Sasha Levin
maintainerPATCH 1/1 drm/amdgpu: Forward VMID reservation errors
From: Natalie Vock <[email protected]>
[ Upstream commit 8defb4f081a5feccc3ea8372d0c7af3522124e1f ]
Otherwise userspace may be fooled into believing it has a reserved VMID when in reality it doesn't, ultimately leading to GPU hangs when SPM is used.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +4 -2
@@ -2747,10 +2747,12 @@ int amdgpu_vm_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)case AMDGPU_VM_OP_RESERVE_VMID :/* We only have requirement to reserve vmid from gfxhub */ if (!fpriv->vm.reserved_vmid[AMDGPU_GFXHUB (0 )]) { -amdgpu_vmid_alloc_reserved (adev,AMDGPU_GFXHUB (0 )); +int r =amdgpu_vmid_alloc_reserved (adev,AMDGPU_GFXHUB (0 )); + +if (r) +return r; fpriv->vm.reserved_vmid[AMDGPU_GFXHUB (0 )] = true; } -break ;case AMDGPU_VM_OP_UNRESERVE_VMID :if (fpriv->vm.reserved_vmid[AMDGPU_GFXHUB (0 )]) {
Signature · 1 line
2.51.0