From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BC8552609FD for ; Mon, 5 Jan 2026 13:19:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767619141; cv=none; b=J2MCcxTKThCmVbV0WwMun03S3XG40z/wbtESSe7Ha/EGwvc4+dEXE6yQWbNNyGigYqKzthxe7/R/mDcq8e/kpAb+iBjUFP8uRgSs/jTC4bFBZL/DPw2wgXAfki46TJ7xx1FmL6ayhpE/1GzYgDYNrdEJ9fpL+BOb7Lv4Hv+hWyM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767619141; c=relaxed/simple; bh=TdIeKCrbpX9j7Q0kid1jyyXL1zySF7mdp8fTUafHIfs=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=KXWvRCg4ykWjbN6ZDlvoNwmay4PwYhwOzVzpPwrpbZdLFmIjGKg130RA094LNSYbwP7cLkAiftdZQVjPg4VYPgjRHm/qDWoISHW7aU7+tq/OiLwGwrnSH/aKqDLZT+K8HBbLMlpP6V5PVs6TrASQ9PpATG7jKr3l0yRqNHHwQeE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Aepc/XLW; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Aepc/XLW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E4939C116D0; Mon, 5 Jan 2026 13:19:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1767619141; bh=TdIeKCrbpX9j7Q0kid1jyyXL1zySF7mdp8fTUafHIfs=; h=Subject:To:Cc:From:Date:From; b=Aepc/XLWdWXjaQzzIaOF9o3p++LRwv+hyDywdPO2YKNAYnKXRYwq+ofb8aXKzsxw1 Y4LEF9nhUOcEgqVnSurh82O5kW/f3RPbC+fXknYETQE3YQgr8mKeUcyJMRqOlIDaz0 /7AM8+RrJ3vurz6VONWFgjRQyAk1ZNBkXXrGBl2Q= Subject: FAILED: patch "[PATCH] drm/amdgpu: Forward VMID reservation errors" failed to apply to 6.6-stable tree To: natalie.vock@gmx.de,alexander.deucher@amd.com,christian.koenig@amd.com Cc: From: Date: Mon, 05 Jan 2026 14:18:50 +0100 Message-ID: <2026010550-duke-justly-8832@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.6-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 . 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.6.y git checkout FETCH_HEAD git cherry-pick -x 8defb4f081a5feccc3ea8372d0c7af3522124e1f # git commit -s git send-email --to '' --in-reply-to '2026010550-duke-justly-8832@gregkh' --subject-prefix 'PATCH 6.6.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 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. Fixes: 80e709ee6ecc ("drm/amdgpu: add option params to enforce process isolation between graphics and compute") Cc: stable@vger.kernel.org Reviewed-by: Christian König Signed-off-by: Natalie Vock Signed-off-by: Alex Deucher diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c index d7cd84d33018..a67285118c37 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c @@ -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;