From: Greg Kroah-Hartman Date: Wed, 3 Aug 2022 12:21:54 +0000 (+0200) Subject: 4.9-stable patches X-Git-Tag: v4.19.255~33 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6b1be59f041fc460a76662f99c8b6d26c6a22723;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: acpi-video-force-backlight-native-for-some-tongfang-devices.patch acpi-video-shortening-quirk-list-by-identifying-clevo-by-board_name-only.patch --- diff --git a/queue-4.9/acpi-video-force-backlight-native-for-some-tongfang-devices.patch b/queue-4.9/acpi-video-force-backlight-native-for-some-tongfang-devices.patch new file mode 100644 index 00000000000..2d277866cc8 --- /dev/null +++ b/queue-4.9/acpi-video-force-backlight-native-for-some-tongfang-devices.patch @@ -0,0 +1,90 @@ +From c752089f7cf5b5800c6ace4cdd1a8351ee78a598 Mon Sep 17 00:00:00 2001 +From: Werner Sembach +Date: Thu, 7 Jul 2022 20:09:52 +0200 +Subject: ACPI: video: Force backlight native for some TongFang devices + +From: Werner Sembach + +commit c752089f7cf5b5800c6ace4cdd1a8351ee78a598 upstream. + +The TongFang PF5PU1G, PF4NU1F, PF5NU1G, and PF5LUXG/TUXEDO BA15 Gen10, +Pulse 14/15 Gen1, and Pulse 15 Gen2 have the same problem as the Clevo +NL5xRU and NL5xNU/TUXEDO Aura 15 Gen1 and Gen2: +They have a working native and video interface. However the default +detection mechanism first registers the video interface before +unregistering it again and switching to the native interface during boot. +This results in a dangling SBIOS request for backlight change for some +reason, causing the backlight to switch to ~2% once per boot on the first +power cord connect or disconnect event. Setting the native interface +explicitly circumvents this buggy behaviour by avoiding the unregistering +process. + +Signed-off-by: Werner Sembach +Cc: All applicable +Reviewed-by: Hans de Goede +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Greg Kroah-Hartman +--- + drivers/acpi/video_detect.c | 51 +++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 50 insertions(+), 1 deletion(-) + +--- a/drivers/acpi/video_detect.c ++++ b/drivers/acpi/video_detect.c +@@ -210,7 +210,56 @@ static const struct dmi_system_id video_ + DMI_MATCH(DMI_BOARD_NAME, "NL5xNU"), + }, + }, +- ++ /* ++ * The TongFang PF5PU1G, PF4NU1F, PF5NU1G, and PF5LUXG/TUXEDO BA15 Gen10, ++ * Pulse 14/15 Gen1, and Pulse 15 Gen2 have the same problem as the Clevo ++ * NL5xRU and NL5xNU/TUXEDO Aura 15 Gen1 and Gen2. See the description ++ * above. ++ */ ++ { ++ .callback = video_detect_force_native, ++ .ident = "TongFang PF5PU1G", ++ .matches = { ++ DMI_MATCH(DMI_BOARD_NAME, "PF5PU1G"), ++ }, ++ }, ++ { ++ .callback = video_detect_force_native, ++ .ident = "TongFang PF4NU1F", ++ .matches = { ++ DMI_MATCH(DMI_BOARD_NAME, "PF4NU1F"), ++ }, ++ }, ++ { ++ .callback = video_detect_force_native, ++ .ident = "TongFang PF4NU1F", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), ++ DMI_MATCH(DMI_BOARD_NAME, "PULSE1401"), ++ }, ++ }, ++ { ++ .callback = video_detect_force_native, ++ .ident = "TongFang PF5NU1G", ++ .matches = { ++ DMI_MATCH(DMI_BOARD_NAME, "PF5NU1G"), ++ }, ++ }, ++ { ++ .callback = video_detect_force_native, ++ .ident = "TongFang PF5NU1G", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), ++ DMI_MATCH(DMI_BOARD_NAME, "PULSE1501"), ++ }, ++ }, ++ { ++ .callback = video_detect_force_native, ++ .ident = "TongFang PF5LUXG", ++ .matches = { ++ DMI_MATCH(DMI_BOARD_NAME, "PF5LUXG"), ++ }, ++ }, + /* + * These models have a working acpi_video backlight control, and using + * native backlight causes a regression where backlight does not work diff --git a/queue-4.9/acpi-video-shortening-quirk-list-by-identifying-clevo-by-board_name-only.patch b/queue-4.9/acpi-video-shortening-quirk-list-by-identifying-clevo-by-board_name-only.patch new file mode 100644 index 00000000000..50dd32f943f --- /dev/null +++ b/queue-4.9/acpi-video-shortening-quirk-list-by-identifying-clevo-by-board_name-only.patch @@ -0,0 +1,75 @@ +From f0341e67b3782603737f7788e71bd3530012a4f4 Mon Sep 17 00:00:00 2001 +From: Werner Sembach +Date: Thu, 7 Jul 2022 20:09:53 +0200 +Subject: ACPI: video: Shortening quirk list by identifying Clevo by board_name only + +From: Werner Sembach + +commit f0341e67b3782603737f7788e71bd3530012a4f4 upstream. + +Taking a recent change in the i8042 quirklist to this one: Clevo +board_names are somewhat unique, and if not: The generic Board_-/Sys_Vendor +string "Notebook" doesn't help much anyway. So identifying the devices just +by the board_name helps keeping the list significantly shorter and might +even hit more devices requiring the fix. + +Signed-off-by: Werner Sembach +Fixes: c844d22fe0c0 ("ACPI: video: Force backlight native for Clevo NL5xRU and NL5xNU") +Cc: All applicable +Reviewed-by: Hans de Goede +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Greg Kroah-Hartman +--- + drivers/acpi/video_detect.c | 34 ---------------------------------- + 1 file changed, 34 deletions(-) + +--- a/drivers/acpi/video_detect.c ++++ b/drivers/acpi/video_detect.c +@@ -150,23 +150,6 @@ static const struct dmi_system_id video_ + .callback = video_detect_force_native, + .ident = "Clevo NL5xRU", + .matches = { +- DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), +- DMI_MATCH(DMI_BOARD_NAME, "NL5xRU"), +- }, +- }, +- { +- .callback = video_detect_force_native, +- .ident = "Clevo NL5xRU", +- .matches = { +- DMI_MATCH(DMI_SYS_VENDOR, "SchenkerTechnologiesGmbH"), +- DMI_MATCH(DMI_BOARD_NAME, "NL5xRU"), +- }, +- }, +- { +- .callback = video_detect_force_native, +- .ident = "Clevo NL5xRU", +- .matches = { +- DMI_MATCH(DMI_SYS_VENDOR, "Notebook"), + DMI_MATCH(DMI_BOARD_NAME, "NL5xRU"), + }, + }, +@@ -190,23 +173,6 @@ static const struct dmi_system_id video_ + .callback = video_detect_force_native, + .ident = "Clevo NL5xNU", + .matches = { +- DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), +- DMI_MATCH(DMI_BOARD_NAME, "NL5xNU"), +- }, +- }, +- { +- .callback = video_detect_force_native, +- .ident = "Clevo NL5xNU", +- .matches = { +- DMI_MATCH(DMI_SYS_VENDOR, "SchenkerTechnologiesGmbH"), +- DMI_MATCH(DMI_BOARD_NAME, "NL5xNU"), +- }, +- }, +- { +- .callback = video_detect_force_native, +- .ident = "Clevo NL5xNU", +- .matches = { +- DMI_MATCH(DMI_SYS_VENDOR, "Notebook"), + DMI_MATCH(DMI_BOARD_NAME, "NL5xNU"), + }, + }, diff --git a/queue-4.9/series b/queue-4.9/series index f7ccdf6e72c..e8edd880501 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -18,3 +18,5 @@ init-main-fix-double-the-in-comment.patch init-main-properly-align-the-multi-line-comment.patch init-move-stack-canary-initialization-after-setup_arch.patch init-main.c-extract-early-boot-entropy-from-the-passed-cmdline.patch +acpi-video-force-backlight-native-for-some-tongfang-devices.patch +acpi-video-shortening-quirk-list-by-identifying-clevo-by-board_name-only.patch