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=1794063713; b=skh9/kfTd8LKUH0YFToiXLdri4zqCxycatZ0XNKIzbZC2Zer/Q1VbZq4t5qucvn0BCsA 61H437OZ9FtG27O6M15zSwOEpwRla8VEp5jbxFGWfdU7YjsbOZh0KcT2CbAboPwf/rZ19 xhwlO/NkNnHxPVDDOHm2gfU6iyQ+fNzVA9ezgUyBt/RBvT7vq7Kt9lXhlfupj0Qt9ymvT MhYQlQtHAcZMk1TaG582UwT65LnJTiVFaAERDPtQocNDYzYIPgNIGs2TSYt0WvTMkuEg2 Pus2hIY7lqV/K6KcglpVUH1/9ITzhU98bwmVnqVbB7Oy4uZBezeaU0kPhSJQBfRW0IQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794063713; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=Z8/0ea/vpbX0XVaf2jigHmUXWbfp4rTUWU9iJE58rtE=; b=oMf9SW1bo7Kn5BekG68CsVupc/M5G3UkO4wNNH4t3KnBOA3JTu2RiD3veTMRSeWF5ThI PhlwQ/U0MGJzNyZUVM0BUl1V6A5zzsGeFXU2vx6w2xkjptvgM74k28WZYyn+tD6qBgMSf w1VENfDmZNbStEiruVPqLiUOZOFeSv+DzfPHtsQ0WQf6PbCZb+4fq/Y2/jqzsiX9TCbqt znBS0qxMAEoNfTcXV2B6SXCs6gz9g9xOCbCDxM4JOU2IVjmF9wfSaHLVqZddlTKH810nL tVaXbRCK539r3gHH7sRzaiOnHqawCS1GL/nBJ7p2lcQzZw07NjUoXmFK2tkMbBRnvzA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=h6VnHQj4; 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 23C84606B8AF; Sat, 7 Nov 2026 15:01:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=h6VnHQj4 Received: by smtp.kernel.org (Postfix) with ESMTPSA id C5B191F0089F; Sat, 7 Nov 2026 15:01:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794063713; bh=Z8/0ea/vpbX0XVaf2jigHmUXWbfp4rTUWU9iJE58rtE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=h6VnHQj4yvX2Z0wFGgX8UU7+bZvofebeFIZROBF8n4UPyXEF9UgbAx/gfkNduFNpc psU2+vi8u6rdlhtzxUh/65cGDhnVaKjLVOmrQl8ibX+TC3azj7J94f4kggVBiE9utR 0LmZ0luOeFBb6/DromxOD/Vp8SAe229xM4HVgmjU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Alex Deucher , Luigi Lauro , Sasha Levin Subject: [PATCH 6.18 814/869] drm/amd/display: take a runtime PM reference only when a CRTC turns on Date: Sat, 7 Nov 2026 08:58:16 -0500 Message-ID: <20261107134920.617598370@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261107134852.069646174@linuxfoundation.org> References: <20261107134852.069646174@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore 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-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Luigi Lauro [ Upstream commit b456f591f925fbd6b33770d0eec1b51c2f9d41c1 ] amdgpu_dm_commit_streams() takes a runtime PM reference for every active CRTC that needs a modeset and has a new stream, but amdgpu_dm_atomic_commit_tail() drops one only for each CRTC that goes from active to inactive. A modeset of a CRTC that is already active (a mode change, or anything else that needs a full modeset) therefore leaks one reference. Once that has happened, the usage count no longer returns to zero with every CRTC off, and the device cannot runtime suspend again until reboot. The two also disagree the other way when a CRTC turns on without a stream ("Failed to create new stream"): no reference is taken, but one is dropped when it turns off. Take the reference in the loop that counts the disabled CRTCs, on the mirror condition: when the CRTC goes from inactive to active, which is what the commit that added it intended ("every time we enable a previously disabled CRTC"). Each active CRTC then holds exactly one reference. Tested on an RX 9070 XT (Navi 48) over OCuLink, with the change backported to 7.2.9: an unplugged connector forced on, then mode A on a CRTC, mode B on the same active CRTC, and the CRTC off, three rounds in a row. The usage count rose by 3 with the stock module, by 0 with this patch, and by 3 again after reloading the stock module. Fixes: 97028037a38a ("drm/amdgpu: Grab/put runtime PM references in atomic_commit_tail()") Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/5951 Assisted-by: Claude:claude-opus-5-5 Reviewed-by: Alex Deucher Signed-off-by: Luigi Lauro Signed-off-by: Alex Deucher (cherry picked from commit 59ef9a435499777b8e1c4e0eff52f813c64fb920) Cc: stable@vger.kernel.org Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index bb1fae39cd395..a77b55ff9321f 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -10550,8 +10550,6 @@ static void amdgpu_dm_commit_streams(struct drm_atomic_state *state, if (dm_old_crtc_state->stream) remove_stream(adev, acrtc, dm_old_crtc_state->stream); - pm_runtime_get_noresume(dev->dev); - acrtc->enabled = true; acrtc->hw_mode = new_crtc_state->mode; crtc->hwmode = new_crtc_state->mode; @@ -11024,8 +11022,13 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) #ifdef CONFIG_DEBUG_FS enum amdgpu_dm_pipe_crc_source cur_crc_src; #endif - /* Count number of newly disabled CRTCs for dropping PM refs later. */ - if (old_crtc_state->active && !new_crtc_state->active) + /* + * One runtime PM reference per active CRTC: take it when the + * CRTC turns on, count it when it turns off for dropping later. + */ + if (!old_crtc_state->active && new_crtc_state->active) + pm_runtime_get_noresume(dev->dev); + else if (old_crtc_state->active && !new_crtc_state->active) crtc_disable_count++; dm_new_crtc_state = to_dm_crtc_state(new_crtc_state); -- 2.53.0