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 64FA4321F5A; Mon, 18 Aug 2025 13:24:29 +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=1755523469; cv=none; b=KaTxE3Z+EazOwKaS4QtoI1vcg2ORNV3jCCEbdIia3tUYkGabPz77t+bYUKRC3wVmO+CwhgbCP5lce4znhxz+LP7RpwxsXNie0r6Qa/0l3q9em35ymzpkAGu/6iCpXa3y5aC3RPRoyk4DdB9hM9MYSmG2idKTSkBhbl6JSUaFBfk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755523469; c=relaxed/simple; bh=nVVmF9k/ixeiBlFzBYrTVSplI0osKzxMLhN9FlKOrjo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iK8gGTOJsf6rSJodwMLyQ2RdU24X0p0pH1q/C67ogXs8SGLq+2Pwga+t94zq3uGOil447nA7g5tx63zO6T0egMQpTD8dDh7Qt1fs0vUYmbv+Yx/JDMfiC8hFxP9RqKHrNncV0Ib6EduCpZNe4Ptmogk+g4vVw1VvaY7SDYh5jgM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=CZRJS5VN; 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="CZRJS5VN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DB134C4CEEB; Mon, 18 Aug 2025 13:24:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755523469; bh=nVVmF9k/ixeiBlFzBYrTVSplI0osKzxMLhN9FlKOrjo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CZRJS5VNRHVeUp2LqUlByyBj+i7D6yvhMkOECk9kEAI7VU6SfQKdnV6Y737ow3xRB bptE92rCIVzPjKuq4sM4MaWfAbmJ5GjisbmM4Y+woocr5tpb7Ff6UxOPOcz1a7stls /yoqWqoJPJkfLXX46091BG+I5i51L+G1aBkuTsjg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, tuhaowen , "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 6.15 153/515] PM: sleep: console: Fix the black screen issue Date: Mon, 18 Aug 2025 14:42:19 +0200 Message-ID: <20250818124504.274125954@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250818124458.334548733@linuxfoundation.org> References: <20250818124458.334548733@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: tuhaowen [ Upstream commit 4266e8fa56d3d982bf451d382a410b9db432015c ] When the computer enters sleep status without a monitor connected, the system switches the console to the virtual terminal tty63(SUSPEND_CONSOLE). If a monitor is subsequently connected before waking up, the system skips the required VT restoration process during wake-up, leaving the console on tty63 instead of switching back to tty1. To fix this issue, a global flag vt_switch_done is introduced to record whether the system has successfully switched to the suspend console via vt_move_to_console() during suspend. If the switch was completed, vt_switch_done is set to 1. Later during resume, this flag is checked to ensure that the original console is restored properly by calling vt_move_to_console(orig_fgconsole, 0). This prevents scenarios where the resume logic skips console restoration due to incorrect detection of the console state, especially when a monitor is reconnected before waking up. Signed-off-by: tuhaowen Link: https://patch.msgid.link/20250611032345.29962-1-tuhaowen@uniontech.com Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- kernel/power/console.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/kernel/power/console.c b/kernel/power/console.c index fcdf0e14a47d..19c48aa5355d 100644 --- a/kernel/power/console.c +++ b/kernel/power/console.c @@ -16,6 +16,7 @@ #define SUSPEND_CONSOLE (MAX_NR_CONSOLES-1) static int orig_fgconsole, orig_kmsg; +static bool vt_switch_done; static DEFINE_MUTEX(vt_switch_mutex); @@ -136,17 +137,21 @@ void pm_prepare_console(void) if (orig_fgconsole < 0) return; + vt_switch_done = true; + orig_kmsg = vt_kmsg_redirect(SUSPEND_CONSOLE); return; } void pm_restore_console(void) { - if (!pm_vt_switch()) + if (!pm_vt_switch() && !vt_switch_done) return; if (orig_fgconsole >= 0) { vt_move_to_console(orig_fgconsole, 0); vt_kmsg_redirect(orig_kmsg); } + + vt_switch_done = false; } -- 2.39.5