rnel.org>)
	for <hi@josie.lol>; Sun, 30 Nov 2025 01:46:46 +0000
Return-path: <stable+bounces-197659-hi=josie.lol@vger.kernel.org>
Envelope-to: hi@josie.lol
Delivery-date: Sun, 30 Nov 2025 01:46:46 +0000
Received: from dfw.mirrors.kernel.org ([142.0.200.124])
	by witcher.mxrouting.net with esmtps  (TLS1.3) tls TLS_AES_256_GCM_SHA384
	(Exim 4.98)
	(envelope-from <stable+bounces-197659-hi=josie.lol@vger.kernel.org>)
	id 1vPWWT-00000008sgb-4038
	for hi@josie.lol;
	Sun, 30 Nov 2025 01:46:46 +0000
Received: from smtp.subspace.kernel.org (relay.kernel.org [52.25.139.140])
	(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by dfw.mirrors.kernel.org (Postfix) with ESMTPS id A64404E0617
	for <hi@josie.lol>; Sun, 30 Nov 2025 01:46:44 +0000 (UTC)
Received: from localhost.localdomain (localhost.localdomain [127.0.0.1])
	by smtp.subspace.kernel.org (Postfix) with ESMTP id CD1B88BEC;
	Sun, 30 Nov 2025 01:46:42 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="PQdbTdvB"
X-Original-To: stable@vger.kernel.org
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 A857D184E
	for <stable@vger.kernel.org>; Sun, 30 Nov 2025 01:46:42 +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=1764467202; cv=none; b=K25mmT1BEEQIucv1QooTaiLQm1VD120aWBuy20jrXNpiXKjZgD9CCNyft3VLBgZf3PzTHlKfnWSzoK2ezQ49OGV+M2W21ZFvFf62gxqOGi1UJ3amas2DJtKzKwnvxSCor2sg4pBOSsvhjL//QgyaqJjMWFhvT8WWEGwd7pcteS0=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1764467202; c=relaxed/simple;
	bh=OqXlEtz2rn8wqWNvDF9whkiZxpiuh7vhQ56XscaI0bU=;
	h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=pXPLMBKgjVrXkzWCGjNUEJhxpaZvu+jMzAiLAOJ+Q3fdYx4r3YrmoJImwFNnRjqgcVlG76EzLY1p95uliB+qopQA/5ecUS9Vt2vTY8fEvyX6BJFNssiYp7MXOqtG6Pku5I2dZ1c6zFdz1CRcw5Z9ceQnf6iqLOaCXfOcvLJ9kCU=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=PQdbTdvB; arc=none smtp.client-ip=10.30.226.201
Received: by smtp.kernel.org (Postfix) with ESMTPSA id D483FC4CEF7;
	Sun, 30 Nov 2025 01:46:41 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
	s=k20201202; t=1764467202;
	bh=OqXlEtz2rn8wqWNvDF9whkiZxpiuh7vhQ56XscaI0bU=;
	h=From:To:Cc:Subject:Date:From;
	b=PQdbTdvBWFT60cxRW2RvBOZ8zmLanqsMd3RIHqQwniDx1lzIKhwePj904rGMhxp1p
	 9CZ9WJ+j6Qv7aP5efc3UMkn+m3+5XXczxEOnfbWHSnydrJi/6N4PctPu9v7Y8lHAda
	 4X55O99OOxUzPKZYJ3bVfdIQKvKOyq4YGUhX7qRORZHQ6nHv5yxo+ofrgZ5ujVzheH
	 H3DQ+0/k7Pnwb+JprVLt2xG5c3H33cDDHnLRAGEkvujNP0jL3DcRa+jG2jowXxByf0
	 0ZSS1hKlEJpFNCPw+0Rv+N5n4bbX11Db6sJJngM+eX2n0q7HVYCxSiFFDPU09gDb1h
	 qRclpWnngrchw==
From: "Mario Limonciello (AMD)" <superm1@kernel.org>
To: amd-gfx@lists.freedesktop.org
Cc: "Mario Limonciello (AMD)" <superm1@kernel.org>,
	stable@vger.kernel.org
Subject: [PATCH] Revert "drm/amd: Skip power ungate during suspend for VPE"
Date: Sat, 29 Nov 2025 19:46:31 -0600
Message-ID: <20251130014631.29755-1-superm1@kernel.org>
X-Mailer: git-send-email 2.43.0
Precedence: bulk
X-Mailing-List: stable@vger.kernel.org
List-Id: <stable.vger.kernel.org>
List-Subscribe: <mailto:stable+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:stable+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-DKIM: signer='kernel.org' status='pass' reason=''
DKIMCheck: Server passes DKIM test, 0 Spam score
X-Spam-Score: -1.2 (-)
X-Spam-Report: Spam detection software, running on the system "witcher.mxrouting.net", has
 performed the tests listed below against this email.
 Information: https://mxroutedocs.com/directadmin/spamfilters/
 ---
 Content analysis details:   (-1.2 points)
 ---
  pts rule name              description
 ---- ---------------------- -----------------------------------------
  0.0 RCVD_IN_DNSWL_BLOCKED  RBL: ADMINISTRATOR NOTICE: The query to
                             DNSWL was blocked.  See
                             http://wiki.apache.org/spamassassin/DnsBlocklists#DnsBlocklists-dnsbl-block
                              for more information.
                             [142.0.200.124 listed in list.dnswl.org]
  0.1 DKIM_SIGNED            Message has a DKIM or DK signature, not necessarily
                             valid
 -0.1 DKIM_VALID             Message has at least one valid DKIM or DK signature
 -0.1 DKIM_VALID_EF          Message has a valid DKIM or DK signature from
                             envelope-from domain
 -0.1 DKIM_VALID_AU          Message has a valid DKIM or DK signature from
                             author's domain
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager
 -0.0 DKIMWL_WL_HIGH         DKIMwl.org - High trust sender
SpamTally: Final spam score: -11

Skipping power ungate exposed some scenarios that will fail
like below:

```
amdgpu: Register(0) [regVPEC_QUEUE_RESET_REQ] failed to reach value 0x00000000 != 0x00000001n
amdgpu 0000:c1:00.0: amdgpu: VPE queue reset failed
...
amdgpu: [drm] *ERROR* wait_for_completion_timeout timeout!
```

The underlying s2idle issue that prompted this commit is going to
be fixed in BIOS.
This reverts commit 31ab31433c9bd2f255c48dc6cb9a99845c58b1e4.

Fixes: 31ab31433c9bd ("drm/amd: Skip power ungate during suspend for VPE")
Cc: stable@vger.kernel.org
Signed-off-by: Mario Limonciello (AMD) <superm1@kernel.org>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 076bbc09f30ce..2819aceaab749 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -3414,11 +3414,10 @@ int amdgpu_device_set_pg_state(struct amdgpu_device *adev,
 		    (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_GFX ||
 		     adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_SDMA))
 			continue;
-		/* skip CG for VCE/UVD/VPE, it's handled specially */
+		/* skip CG for VCE/UVD, it's handled specially */
 		if (adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_UVD &&
 		    adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_VCE &&
 		    adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_VCN &&
-		    adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_VPE &&
 		    adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_JPEG &&
 		    adev->ip_blocks[i].version->funcs->set_powergating_state) {
 			/* enable powergating to save power */
-- 
2.43.0



From - Sun Nov 30 02:56:45 2025
X-Mozilla-Status: 0001
X-Mozilla-Status2: 00000000
Return-Path: <linux-s390+bounces-15240-hi=josie.lol@vger.kernel.org>
Delivered-To: hi@josie.lol
Received: from witcher.mxrouting.net
	by witcher.mxrouting.net with LMTP
	id KEEoN2iyK2mBwSMAYBR5ng
	(envelope-from <linux-s390+bounces-15240-hi=josie.lol@vger.kernel.org>)
	for <hi@josie.lol>; Sun, 30 Nov 2025 02:56:40 +0000
Return-path: <linux-s390+bounces-15240-hi=josie.lol@vger.kernel.org>
Envelope-to: hi@josie.lol
Delivery-date: Sun, 30 Nov 2025 02:56:41 +0000
Received: from ams.mirrors.kernel.org ([213.196.21.55])
	by witcher.mxrouting.net with esmtps  (TLS1.3) tls TLS_AES_256_GCM_SHA384
	(Exim 4.98)
	(envelope-from <linux-s390+bounces-15240-hi=josie.lol@vger.kernel.org>)
	id 1vPXc8-0000000AotY-1mgH
	for hi@josie.lol;
	Sun, 30 Nov 2025 02:56:40 +0000
Received: from smtp.subspace.kernel.org (relay.kernel.org [52.25.139.140])
	(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by ams.mirrors.kernel.org (Postfix) with ESMTPS id 2114C345F20
	for <hit it on modern SQLite.\n\n3. The test files (`web/lists.test.js` and `web/share.test.js`) test standalone scripts (`web/lists.js`, `web/share.js`), not the Vite SPA versions (`web/src/views/lists.js`, etc.). The plan needs to update both.\n\n4. D\n\nThe PoP implementation is the riskiest part, but there are no blocking concerns with the overall plan. I'm ready to start execution using the git worktree skill first, then proceeding in batches. I notice the plan was already created in a previous session, so I can reference the full transcript if I need specific details.\n\nLet me set up a worktree for isolation, create a todo list for tracking progress, and begin Phase 0 to remove ActivityPub code. Actually, since this is a major migration, I'll just create a branch on the current worktree rather than setting up a separate worktree—that'll be simpler and still give me the isolation I need.","signature":" "}],"stop_reason":null,"stop_sequence":null,"usage":{"input_tokens":1,"cache_creation_input_tokens":9869,"cache_read_input_tokens":106003,"cache_creation":{"ephemeral_5m_input_tokens":0,"ephemeral_1h_input_tokens":9869},"output_tokens":8,"service_tier":"standard","inference_geo":"not_available"}},"requestId":"req_011CYVJFnBABaa7RqrYAsLow","type":"assistant","uuid":"e270878f-2fcb-4322-8c04-a8d85de50873","timestamp":"2026-02-25T18:57:32.560Z"}
{"parentUuid":"e270878f-2fcb-4322-8c04-a8d85de50873","isSidechain":false,"userType":"external","cwd":"/home/josie/development/personal/josiedot/place","sessionId":"ace9d424-1589-42be-8175-304dbc63196d","version":"2.1.52","gitBranch":"main","slug":"flickering-herding-quail","message":{"model":"claude-opus-4-6","id":"msg_01TYZ9phceUNjQBrUJMMwwc2","type":"message","role":"assistant","content":[{"type":"text","text":"I've now reviewed the entire codebase. The plan is solid and maps accurately to the existing code. A few observations before starting:\n\n1. **`openssl_ext` should be kept** -- we need it for EC P-256 key generation and ES256 signing in DPoP\n2. The standalone scripts (`web/share.js`, `web/lists.js`, `web/friends.js`) and the SPA versions (`web/src/views/`) both need updates\n3. The test files test the standalone scripts, not the SPA views\n\nNo blocking concerns. Let me set up a branch and start executing."}],"stop_reason":null,"stop_sequence":null,"usage":{"input_tokens":1,"cache_creation_input_tokens":9869,"cache_read_input_tokens":106003,"cache_creation":{"ephemeral_5m_input_tokens":0,"ephemeral_1h_input_tokens":9869},"output_tokens":8,"service_tier":"standard","inference_geo":"not_available"}},"requestId":"req_011CYVJFnBABaa7RqrYAsLow","type":"assistant","uuid":"905c305b-4ff8-45c3-801b-5d2c73f9f7cc","timestamp":"2026-02-25T18:57:34.894Z"}
{"parentUuid":"905c305b-4ff8-45c3-801b-5d2c73f9f7cc","isSidechain":false,"userType":"external","cwd":"/home/josie/development/personal/josiedot/place","sessionId":"ace9d424-1589-42be-8175-304dbc63196d","version":"2.1.52","gitBranch":"main","slug":"flickering-herding-quail","message":{"model":"claude-opus-4-6","id":"msg_01TYZ9phceUNjQBrUJMMwwc2","type":"message","role":"assistant","content":[{"type":"tool_use","id":"toolu_01CAFQqdugBbXmCLshQurWUg","name":"Bash","input":{"command":"git checkout -b atproto-migration","description":"Create atproto-migration branch"},"caller":{"type":"direct"}}],"stop_reason":null,"stop_sequence":null,"usage":{"input_tokens":1,"cache_creation_input_tokens":9869,"cache_read_input_tokens":106003,"cache_creation":{"ephemeral_5m_input_tokens":0,"ephemeral_1h_input_tokens":9869},"output_tokens":8,"service_tier":"standard","inference_geo":"not_available"}},"requestId":"req_011CYVJFnBABaa7RqrYAsLow","type":"assistant","uuid":"00c05c77-c79d-4a46-bfc7-82f8c37829f4","timestamp":"2026-02-25T18:57:35.684Z"}
{"parentUuid":"00c05c77-c79d-4a46-bfc7-82f8c37829f4","isSidechain":false,"userType":"external","cwd":"/home/josie/development/personal/josiedot/place","sessionId":"ace9d424-1589-42be-8175-304dbc63196d","version":"2.1.52","gitBranch":"main","slug":"flickering-herding-quail","type":"progress","data":{"type":"hook_progress","hookEvent":"PreToolUse","hookName":"PreToolUse:Bash","command":"python3 ${CLAUDE_PLUGIN_ROOT}/hooks/pretooluse.py"},"toolUseID":"toolu_01CAFQqdugBbXmCLshQurWUg","parentToolUseID":"toolu_01CAFQqdugBbXmCLshQurWUg","uuid":"6e692276-b1ff-4273-935a-58fe9e80e583","timestamp":"2026-02-25T18:57:35.688Z"}
{"parentUuid":"6e692276-b1ff-4273-935a-58fe9e80e583","isSidechain":false,"userType":"external","cwd":"/home/josie/development/personal/josiedot/place","sessionId":"ace9d424-1589-42be-8175-304dbc63196d","version":"2.1.52","gitBranch":"main","slug":"flickering-herding-quail","type":"progress","data":{"type":"hook_progress","hookEvent":"PostToolUse","hookName":"PostToolUse:Bash","command":"python3 ${CLAUDE_PLUGIN_ROOT}/hooks/posttooluse.py"},"parentToolUseID":"toolu_01CAFQqdugBbXmCLshQurWUg","toolUseID":"toolu_01CAFQqdugBbXmCLshQurWUg","timestamp":"2026-02-25T19:13:13.948Z","uuid":"538098ba-8da2-4e40-bc2a-098f63667913"}
{"parentUuid":"00c05c77-c79d-4a46-bfc7-82f8c37829f4","isSidechain":false,"userType":"external","cwd":"/home/josie/development/personal/josiedot/place","sessionId":"ace9d424-1589-42be-8175-304dbc63196d","version":"2.1.52","gitBranch":"main","slug":"flickering-herding-quail","type":"user","message":{"role":"user","content":[{"tool_use_id":"toolu_01CAFQqdugBbXmCLshQurWUg","type":"tool_result","content":"Switched to a new branch 'atproto-migration'","is_error":false}]},"uuid":"5183497f-5d96-4336-952b-c9f550e57720","timestamp":"2026-02-25T19:13:13.946Z","toolUseResult":{"stdout":"Switched to a new branch 'atproto-migration'","stderr":"","interrupted":false,"isImage":false,"noOutputExpected":false},"sourceToolAssistantUUID":"00c05c77-c79d-4a46-bfc7-82f8c37829f4"}
{"parentUuid":"5183497f-5d96-4336-952b-c9f550e57720","isSidechain":false,"userType":"external","cwd":"/home/josie/development/personal/josiedot/place","sessionId":"ace9d424-1589-42be-8175-304dbc63196d","version":"2.1.52","gitBranch":"atproto-migration","slug":"flickering-herding-quail","message":{"model":"claude-opus-4-6","id":"msg_01JuEUJfMp35NxjoeE5ECqdK","type":"message","role":"assistant","content":[{"type":"tool_use","id":"toolu_01VJF21Gb1nRgs2QggLPzvGh","name":"ToolSearch","input":{"query":"select:TaskCreate","max_results":1},"caller":{"type":"direct"}}],"stop_reason":null,"stop_sequence":null,"usage":{"input_tokens":1,"cache_creation_input_tokens":1165,"cache_read_input_tokens":115872,"output_tokens":75,"server_tool_use":{"web_search_requests":0,"web_fetch_requests":0},"service_tier":"standard","cache_creation":{"ephemeral_1h_input_tokens":1165,"ephemeral_5m_input_tokens":0},"inference_geo":"","iterations":[],"speed":"standard"}},"requestId":"req_011CYVKV7C8NFqp3FnshhV8x","type":"assistant","uuid":"64a67d46-29fd-461e-a6ed-cbcae1add1bb","timestamp":"2026-02-25T19:13:17.387Z"}
{"parentUuid":"64a67d46-29fd-461e-a6ed-cbcae1add1bb","isSidechain":false,"userType":"external","cwd":"/home/josie/development/personal/josiedot/place","sessionId":"ace9d424-1589-42be-8175-304dbc63196d","version":"2.1.52","gitBranch":"atproto-migration","slug":"flickering-herding-quail","type":"progress","data":{"type":"hook_progress","hookEvent":"PreToolUse","hookName":"PreToolUse:ToolSearch","command":"python3 ${CLAUDE_PLUGIN_ROOT}/hooks/pretooluse.py"},"toolUseID":"toolu_01VJF21Gb1nRgs2QggLPzvGh","parentToolUseID":"toolu_01VJF21Gb1nRgs2QggLPzvGh","uuid":"a58e3f63-d372-4f09-969a-4681bbb31a0c","timestamp":"2026-02-25T19:13:17.390Z"}
{"parentUuid":"a58e3f63-d372-4f09-969a-4681bbb31a0c","isSidechain":false,"userType":"externa