Linux Power Management development
 help / color / mirror / Atom feed
From: tuhaowen <tuhaowen@uniontech.com>
To: pavel@kernel.org, len.brown@intel.com
Cc: rafael@kernel.org, linux-kernel@vger.kernel.org,
	linux-pm@vger.kernel.org, huangbibo@uniontech.com,
	tuhaowen@uniontech.com, wangyuli@uniontech.com
Subject: [PATCH v2] PM/console: Fix the black screen issue
Date: Fri, 16 May 2025 16:40:11 +0800	[thread overview]
Message-ID: <20250516084011.29309-1-tuhaowen@uniontech.com> (raw)
In-Reply-To: <CAJZ5v0gOa8H-yABSepfy-WyOKJqRjCMhYPdbAHox3qUVmOXS6w@mail.gmail.com>

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 <tuhaowen@uniontech.com>
---
Changes in v2:
- Added explanation in the commit message on how the issue is fixed.
- Link to v1: https://lore.kernel.org/all/20250516034643.22355-1-tuhaowen@uniontech.com
---
 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..832e04bf5439 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 int vt_switch_done;
 
 static DEFINE_MUTEX(vt_switch_mutex);
 
@@ -136,15 +137,19 @@ void pm_prepare_console(void)
 	if (orig_fgconsole < 0)
 		return;
 
+	vt_switch_done = 1;
+
 	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;
 
+	vt_switch_done = 0;
+
 	if (orig_fgconsole >= 0) {
 		vt_move_to_console(orig_fgconsole, 0);
 		vt_kmsg_redirect(orig_kmsg);
-- 
2.20.1


  reply	other threads:[~2025-05-16  8:41 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-05-16  3:46 [PATCH] PM/console: Fix the black screen issue tuhaowen
2025-05-16  8:16 ` Rafael J. Wysocki
2025-05-16  8:40   ` tuhaowen [this message]
2025-05-23  8:56     ` [PATCH v2 RESEND] " tuhaowen
2025-05-23 15:10       ` Rafael J. Wysocki
2025-05-26  1:08         ` [PATCH v3] " tuhaowen
2025-06-03  1:01           ` [PATCH v4] " tuhaowen
2025-06-11  3:23             ` [PATCH v4 RESEND] " tuhaowen
2025-07-03 14:00             ` [PATCH v4] " Rafael J. Wysocki

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250516084011.29309-1-tuhaowen@uniontech.com \
    --to=tuhaowen@uniontech.com \
    --cc=huangbibo@uniontech.com \
    --cc=len.brown@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=pavel@kernel.org \
    --cc=rafael@kernel.org \
    --cc=wangyuli@uniontech.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox