From: Corentin Chary <corentincj@iksaif.net>
To: Matthew Garrett <mjg59@srcf.ucam.org>
Cc: Corentin Chary <corentincj@iksaif.net>,
Matthew Garrett <mjg@redhat.com>,
platform-driver-x86@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] samsung-laptop: unregister ACPI video module for some well known laptops
Date: Thu, 22 Mar 2012 14:08:19 +0100 [thread overview]
Message-ID: <1332421699-5315-1-git-send-email-corentincj@iksaif.net> (raw)
In-Reply-To: <20120320163002.GB6811@srcf.ucam.org>
On these laptops, the ACPI video is not functional, and very unlikely
to be fixed by the vendor. Note that intel_backlight works for some
of these laptops, and the backlight from samsung-laptop always work.
The good news is that newer laptops have functional ACPI video device
and won't end up growing this list.
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
drivers/platform/x86/samsung-laptop.c | 80 +++++++++++++++++++++++++++++++--
1 files changed, 76 insertions(+), 4 deletions(-)
diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c
index 4787afd..e2a34b4 100644
--- a/drivers/platform/x86/samsung-laptop.c
+++ b/drivers/platform/x86/samsung-laptop.c
@@ -26,6 +26,9 @@
#include <linux/seq_file.h>
#include <linux/debugfs.h>
#include <linux/ctype.h>
+#if (defined CONFIG_ACPI_VIDEO || defined CONFIG_ACPI_VIDEO_MODULE)
+#include <acpi/video.h>
+#endif
/*
* This driver is needed because a number of Samsung laptops do not hook
@@ -336,6 +339,7 @@ struct samsung_laptop {
struct work_struct kbd_led_work;
struct samsung_laptop_debug debug;
+ struct samsung_quirks *quirks;
bool handle_backlight;
bool has_stepping_quirk;
@@ -343,7 +347,15 @@ struct samsung_laptop {
char sdiag[64];
};
+struct samsung_quirks {
+ bool broken_acpi_video;
+};
+
+static struct samsung_quirks samsung_unknown = {};
+static struct samsung_quirks samsung_broken_acpi_video = {
+ .broken_acpi_video = true,
+};
static bool force;
module_param(force, bool, 0);
@@ -1416,6 +1428,14 @@ static int __init samsung_platform_init(struct samsung_laptop *samsung)
return 0;
}
+static struct samsung_quirks *quirks;
+
+static int __init samsung_dmi_matched(const struct dmi_system_id *d)
+{
+ quirks = d->driver_data;
+ return 0;
+}
+
static struct dmi_system_id __initdata samsung_dmi_table[] = {
{
.matches = {
@@ -1445,6 +1465,47 @@ static struct dmi_system_id __initdata samsung_dmi_table[] = {
DMI_MATCH(DMI_CHASSIS_TYPE, "14"), /* Sub-Notebook */
},
},
+ /* Specific DMI ids for laptop with quirks */
+ {
+ .callback = samsung_dmi_matched,
+ .ident = "N150P",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
+ DMI_MATCH(DMI_PRODUCT_NAME, "N150P"),
+ DMI_MATCH(DMI_BOARD_NAME, "N150P"),
+ },
+ .driver_data = &samsung_broken_acpi_video,
+ },
+ {
+ .callback = samsung_dmi_matched,
+ .ident = "N145P/N250P/N260P",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
+ DMI_MATCH(DMI_PRODUCT_NAME, "N145P/N250P/N260P"),
+ DMI_MATCH(DMI_BOARD_NAME, "N145P/N250P/N260P"),
+ },
+ .driver_data = &samsung_broken_acpi_video,
+ },
+ {
+ .callback = samsung_dmi_matched,
+ .ident = "N150/N210/N220",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
+ DMI_MATCH(DMI_PRODUCT_NAME, "N150/N210/N220"),
+ DMI_MATCH(DMI_BOARD_NAME, "N150/N210/N220"),
+ },
+ .driver_data = &samsung_broken_acpi_video,
+ },
+ {
+ .callback = samsung_dmi_matched,
+ .ident = "NF110/NF210/NF310",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
+ DMI_MATCH(DMI_PRODUCT_NAME, "NF110/NF210/NF310"),
+ DMI_MATCH(DMI_BOARD_NAME, "NF110/NF210/NF310"),
+ },
+ .driver_data = &samsung_broken_acpi_video,
+ },
{ },
};
MODULE_DEVICE_TABLE(dmi, samsung_dmi_table);
@@ -1456,6 +1517,7 @@ static int __init samsung_init(void)
struct samsung_laptop *samsung;
int ret;
+ quirks = &samsung_unknown;
if (!force && !dmi_check_system(samsung_dmi_table))
return -ENODEV;
@@ -1465,12 +1527,21 @@ static int __init samsung_init(void)
mutex_init(&samsung->sabi_mutex);
samsung->handle_backlight = true;
+ samsung->quirks = quirks;
-#ifdef CONFIG_ACPI
+
+#if (defined CONFIG_ACPI_VIDEO || defined CONFIG_ACPI_VIDEO_MODULE)
/* Don't handle backlight here if the acpi video already handle it */
- if (acpi_video_backlight_support())
- samsung->handle_backlight = false;
+ if (acpi_video_backlight_support()) {
+ if (samsung->quirks->broken_acpi_video) {
+ pr_info("Disabling ACPI video driver\n");
+ acpi_video_unregister();
+ } else {
+ samsung->handle_backlight = false;
+ }
+ }
#endif
+
ret = samsung_platform_init(samsung);
if (ret)
goto error_platform;
@@ -1481,7 +1552,8 @@ static int __init samsung_init(void)
#ifdef CONFIG_ACPI
/* Only log that if we are really on a sabi platform */
- if (acpi_video_backlight_support())
+ if (acpi_video_backlight_support() &&
+ !samsung->quirks->broken_acpi_video)
pr_info("Backlight controlled by ACPI video driver\n");
#endif
--
1.7.3.4
next prev parent reply other threads:[~2012-03-22 13:03 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1332233594-13099-1-git-send-email-corentin.chary@gmail.com>
2012-03-20 8:53 ` [PATCH 01/14] ACPI / Video: blacklist some samsung laptops Corentin Chary
2012-03-20 16:05 ` Matthew Garrett
2012-03-20 16:28 ` Corentin Chary
2012-03-20 16:30 ` Matthew Garrett
2012-03-22 13:08 ` Corentin Chary [this message]
2012-03-27 9:11 ` [PATCH] samsung-laptop: unregister ACPI video module for some well known laptops Corentin Chary
2012-03-27 11:21 ` Matthew Garrett
2012-04-06 9:42 ` Corentin Chary
2012-04-06 14:34 ` Seth Forshee
2012-04-17 8:31 ` Corentin Chary
2012-03-20 8:53 ` [PATCH 02/14] asus-nb-wmi: ignore useless keys Corentin Chary
2012-03-20 8:53 ` [PATCH 03/14] eeepc-wmi: add extra keymaps for EP121 Corentin Chary
2012-03-20 8:53 ` [PATCH 04/14] asus-wmi: on/off bit is not set when reading the value Corentin Chary
2012-03-20 8:53 ` [PATCH 05/14] drivers, samsung-laptop: fix initialization of sabi_data in sabi_set_commandb Corentin Chary
2012-03-20 8:53 ` [PATCH 06/14] drivers, samsung-laptop: fix usage of isalnum Corentin Chary
2012-03-20 8:53 ` [PATCH 07/14] samsung-laptop: cleanup return type: mode_t vs umode_t Corentin Chary
2012-03-20 8:53 ` [PATCH 08/14] asus-wmi: add scalar board brightness adj. support Corentin Chary
2012-03-20 8:53 ` [PATCH 09/14] asus-wmi: store backlight power status for AIO machine Corentin Chary
2012-03-20 8:53 ` [PATCH 10/14] asus-wmi: move WAPF variable into quirks_entry Corentin Chary
2012-03-20 8:53 ` [PATCH 11/14] asus-nb-wmi: set panel_power correctly Corentin Chary
2012-03-20 8:53 ` [PATCH 12/14] eeepc-wmi: refine quirks handling Corentin Chary
2012-03-20 8:53 ` [PATCH 13/14] eeepc-wmi: split et2012 specific hacks Corentin Chary
2012-03-20 8:53 ` [PATCH 14/14] asus-wmi: don't update power and brightness when using scalar Corentin Chary
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=1332421699-5315-1-git-send-email-corentincj@iksaif.net \
--to=corentincj@iksaif.net \
--cc=linux-kernel@vger.kernel.org \
--cc=mjg59@srcf.ucam.org \
--cc=mjg@redhat.com \
--cc=platform-driver-x86@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).