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 79B3331A063; Mon, 18 Aug 2025 12:56:49 +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=1755521809; cv=none; b=XTpXdLmOmojocWxBaxqFXTrQF1LJZpd937mNqMkLgccHhfKecCkPwRchePuATrzHwDwPo3pt9CzJJPzj3oJYK2x1PidH0iWcUGxIUqWmhKz8kbbSVLtpukOZ9UwErNFSk84KjfWJrOf6r5ElZs3R+dumwwBniFfQABUYeVnvf9c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755521809; c=relaxed/simple; bh=yGotZOEQOsewFDW/iBIK9J19ohJiDKVGKTSX82UYL1k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rH/zR2rHqRuXgToCKPp14c8JGtaWYuH6oRmROVbXzDrRkxYBNw9LKqPumvMdcBSqLJW4TY113lhGSWzxmMp9ln1QVgOritJheNZJBEYPewWyNSZ+KVClJHqHn4aG5787IT59uXXsJ3tNmEbs+j5ucjSSpG+kOyrU9/eIino4kHY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=KiIBX8aP; 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="KiIBX8aP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E296BC4AF09; Mon, 18 Aug 2025 12:56:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755521809; bh=yGotZOEQOsewFDW/iBIK9J19ohJiDKVGKTSX82UYL1k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KiIBX8aP/C83P3q/3EUtTelz0JWiMjjP3hDDYv7UM5krpEwxJOuyAc5ziLEeEpBhM Gae2Muu+pge5iXKPShNu/VyPuErmX6wiVSOdYgleGf9RVHafyxFZfOjR4ThwhP++XA cywYKjajpl3qg3vukor6n/m3+IgBqCeHqVh9DxDE= 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.12 129/444] PM: sleep: console: Fix the black screen issue Date: Mon, 18 Aug 2025 14:42:35 +0200 Message-ID: <20250818124453.755025120@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250818124448.879659024@linuxfoundation.org> References: <20250818124448.879659024@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.12-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