From: lianzhi chang <changlianzhi@uniontech.com>
To: linux-kernel@vger.kernel.org
Cc: dmitry.torokhov@gmail.com, gregkh@linuxfoundation.org,
jirislaby@kernel.org, andriy.shevchenko@linux.intel.com,
linux-input@vger.kernel.org, 282827961@qq.com,
lianzhi chang <changlianzhi@uniontech.com>
Subject: [[PATCH v4]] tty: Fix the keyboard led light display problem
Date: Wed, 20 Oct 2021 15:44:23 +0800 [thread overview]
Message-ID: <20211020074423.11932-1-changlianzhi@uniontech.com> (raw)
Switching from the desktop environment to the tty environment,
the state of the keyboard led lights and the state of the keyboard
lock are inconsistent. This is because the attribute kb->kbdmode
of the tty bound in the desktop environment (xorg) is set to
VC_OFF, which causes the ledstate and kb->ledflagstate
values of the bound tty to always be 0, which causes the switch
from the desktop When to the tty environment, the LED light
status is inconsistent with the keyboard lock status.
Signed-off-by: lianzhi chang <changlianzhi@uniontech.com>
---
v2-->v3:
(1) Abandon the previous modification plan.
(2) Added the kbd_update_ledstate function, this function gets the
latest state of the led from the input device, and then synchronizes
it to the ledstate. The kbd_event function calls it.
(3) When the tty's kbdmode==VC_OFF, the tty does not set the keyboard light (modify the kbd_bh function).
v3-->v4:
Correct the subject
drivers/tty/vt/keyboard.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
index c7fbbcdcc346..5fcdd1805b4d 100644
--- a/drivers/tty/vt/keyboard.c
+++ b/drivers/tty/vt/keyboard.c
@@ -1130,6 +1130,22 @@ static void kbd_init_leds(void)
#endif
+static void kbd_update_ledstate(struct input_dev *dev)
+{
+ unsigned long leds = (unsigned long)ledstate;
+
+ if (test_bit(EV_LED, dev->evbit)) {
+ if (ledstate == -1U)
+ ledstate = 0;
+ if (!!test_bit(LED_NUML, dev->led) != !!test_bit(VC_NUMLOCK, &leds))
+ ledstate ^= BIT(VC_NUMLOCK);
+ if (!!test_bit(LED_CAPSL, dev->led) != !!test_bit(VC_CAPSLOCK, &leds))
+ ledstate ^= BIT(VC_CAPSLOCK);
+ if (!!test_bit(LED_SCROLLL, dev->led) != !!test_bit(VC_SCROLLOCK, &leds))
+ ledstate ^= BIT(VC_SCROLLOCK);
+ }
+}
+
/*
* The leds display either (i) the status of NumLock, CapsLock, ScrollLock,
* or (ii) whatever pattern of lights people want to show using KDSETLED,
@@ -1249,6 +1265,10 @@ static void kbd_bh(struct tasklet_struct *unused)
{
unsigned int leds;
unsigned long flags;
+ struct kbd_struct *kb = kbd_table + fg_console;
+
+ if (kb->kbdmode == VC_OFF)
+ return;
spin_lock_irqsave(&led_lock, flags);
leds = getleds();
@@ -1524,6 +1544,8 @@ static void kbd_event(struct input_handle *handle, unsigned int event_type,
/* We are called with interrupts disabled, just take the lock */
spin_lock(&kbd_event_lock);
+ kbd_update_ledstate(handle->dev);
+
if (event_type == EV_MSC && event_code == MSC_RAW &&
kbd_is_hw_raw(handle->dev))
kbd_rawcode(value);
--
2.20.1
next reply other threads:[~2021-10-20 7:44 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-20 7:44 lianzhi chang [this message]
2021-10-20 11:37 ` [[PATCH v4]] tty: Fix the keyboard led light display problem Andy Shevchenko
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=20211020074423.11932-1-changlianzhi@uniontech.com \
--to=changlianzhi@uniontech.com \
--cc=282827961@qq.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=dmitry.torokhov@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=jirislaby@kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).