From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794273851; b=xqTT3rEjf5Uz5K7xHyXtvYOXwc6GMcirLWb3tfe9d1Tht5EaKkCDdlhm0g+o+HqHlQwx 7vsN/X/LiSu6FomcDMQlghZqF5GcDhFZYIrYPchrG+r4RffrRfWAuMc1/GSnIEebu7rdb X8B753PvGh9V85BkjSrD5wPDxSyl6rhx/WwlJxCXHhm0O9GcduMcg5TVNdMMAgxuN6D3E VWDA2H7OTn/aUhuplvg+cfI05kaUyQkf+rKlH+tLiAlTGwEhy3VA8lS/qUf+ivt0XtLBQ Si2dRI3VtxjttI3U0IMq4sfWnw2A9Z4vWvNo8kG4TV/DTCJ+Kd8B5TWqcTC+x24nf7g== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794273851; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=Wt8sr9ENIh3POgj5ixCPwKNszZhumHyI9nsWJA5Ki9w=; b=Et0LP/H77/gqxLDglm4AS2falgJ0FCVKp2tVvZzaOgB0VMQkVCpGQs7DWcrHxp4O4+0e HtL3OHMH8I3cao7/hlnDo8qIaChYFpxqCcdv+1l3YsNZLeKa9+TwrznvMsWaOHbm9BLIJ W7cDl13lVLW+mA9KKA5DbpfV7OUYwHruOv5oRqx3i44HYeS+8Op/tVZNoq6Cejs9EbCkW 1wXUoslBxIjkzmXpVmiIP2ri37adD3QIAwAc+EI00Einakzy8dq/JbuPo0wrOXpPS2gid ZkSGEXEfDem2jFl1ct3pvqiHPxNeRRfnXyDQlce1TgDBPcE3+NTNMQZ1/7VAndUeF6w== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b="UKLad/1c"; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1033C60A2615 for ; Tue, 10 Nov 2026 01:24:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=UKLad/1c Received: by smtp.kernel.org (Postfix) with ESMTPSA id 647DA1F0089F; Tue, 10 Nov 2026 01:24:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794273850; bh=Wt8sr9ENIh3POgj5ixCPwKNszZhumHyI9nsWJA5Ki9w=; h=From:To:Cc:Subject:Date; b=UKLad/1cgx8+eDOJJyuDbgDbNlgYkMvDLzvd8pAJ0ggIOtj5yX4xGftj5KRZqfeSd gC9pNYkZeqsN0fNoZ/8U/6pYr6OpdtJ9L8Vi8dWRDCuQt+KmtWdEO9sbap76BeI7B+ H6j8XPjTOTBersbiLBz3htp7g2PuC6NPdZObIQw3NG17aYWsleuJeAdMNr+4UYc0BY hINRd66Cpfmzqdt98AS9ARU/C8O7W1QOmQZzhfM2VCsVm7cl+jV2kfr9DCHl/H5KYS OTNVNwAM85g6w7YRfUOMNk8HeWg4kRy4KPcEVMKRLac+MuP7yLcxcCyLvvvs8xkUQ3 b7NKaABQmFSwg== From: Sasha Levin To: prike.liang@amd.com, lijo.lazar@amd.com, alexander.deucher@amd.com Cc: stable@vger.kernel.org Subject: FAILED: patch "[PATCH] drm/amdgpu: finish GPU recovery callbacks before restarting schedulers" failed to apply to 5.15-stable tree Date: Mon, 9 Nov 2026 20:24:09 -0500 Message-ID: <20261109202409-failed-5.15-733389cb31e2@kernel.org> X-Mailer: git-send-email 2.53.0 X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.15-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-5.15.y git checkout FETCH_HEAD git cherry-pick -x 733389cb31e2c55e355410759fdc68afe74a4582 # git commit -s git send-email --to '' --in-reply-to '20261109202409-failed-5.15-733389cb31e2@kernel.org' --subject-prefix 'PATCH 5.15.y' 'HEAD^..' Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From 733389cb31e2c55e355410759fdc68afe74a4582 Mon Sep 17 00:00:00 2001 From: Prike Liang Date: Thu, 20 Aug 2026 15:27:56 +0800 Subject: [PATCH] drm/amdgpu: finish GPU recovery callbacks before restarting schedulers Run GPU post-reset callbacks, including KFD and display-audio resume, before restarting DRM scheduler workqueues. IP hardware initialization already happens inside ASIC recovery; this change orders the remaining callbacks before new scheduler submissions. Preserve the emergency-stop and guity job completition path's callbacks without starting schedulers, Signed-off-by: Prike Liang Acked-by: Lijo Lazar Signed-off-by: Alex Deucher (cherry picked from commit 1f6433e2b264e75c56ae95f187788806201bdbc3) Cc: stable@vger.kernel.org --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 53f05ee7193f2..5bec9cd3f7d39 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -5859,8 +5859,10 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev, amdgpu_device_halt_activities(adev, job, reset_context, &device_list, hive, need_emergency_restart); - if (need_emergency_restart) - goto skip_sched_resume; + if (need_emergency_restart) { + amdgpu_device_gpu_resume(adev, &device_list, need_emergency_restart); + goto reset_unlock; + } /* * Must check guilty signal here since after this point all old * HW fences are force signaled. @@ -5870,18 +5872,17 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev, if (job && (dma_fence_get_status(&job->hw_fence->base) > 0)) { job_signaled = true; dev_info(adev->dev, "Guilty job already signaled, skipping HW reset"); - goto skip_hw_reset; + goto post_resume; } r = amdgpu_device_asic_reset(adev, &device_list, reset_context); if (r) goto reset_unlock; -skip_hw_reset: +post_resume: + amdgpu_device_gpu_resume(adev, &device_list, need_emergency_restart); r = amdgpu_device_sched_resume(&device_list, reset_context, job_signaled); if (r) goto reset_unlock; -skip_sched_resume: - amdgpu_device_gpu_resume(adev, &device_list, need_emergency_restart); reset_unlock: amdgpu_device_recovery_put_reset_lock(adev, &device_list); amdgpu_ras_post_reset(adev, &device_list); -- 2.53.0