summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/blacklist.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-10-08 22:37:46 -0400
committerLen Brown <len.brown@intel.com>2010-10-08 22:37:46 -0400
commit7cfff7f21221725f587ba90bd1acf0e2e0304901 (patch)
tree28830302ef62264fa3c069313976e6c6daed7a33 /drivers/acpi/blacklist.c
parentc9933f795c0740eaf97e6291a68a9787346d5997 (diff)
parent3deb11ef16632fb76daead0db281f6f7d19332f2 (diff)
downloadlinux-7cfff7f21221725f587ba90bd1acf0e2e0304901.tar.bz2
Merge branch 'msi-dmi' into release
Diffstat (limited to 'drivers/acpi/blacklist.c')
-rw-r--r--drivers/acpi/blacklist.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
index f7619600270a..af308d03f492 100644
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
@@ -204,6 +204,23 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
},
},
{
+ /*
+ * There have a NVIF method in MSI GX723 DSDT need call by Nvidia
+ * driver (e.g. nouveau) when user press brightness hotkey.
+ * Currently, nouveau driver didn't do the job and it causes there
+ * have a infinite while loop in DSDT when user press hotkey.
+ * We add MSI GX723's dmi information to this table for workaround
+ * this issue.
+ * Will remove MSI GX723 from the table after nouveau grows support.
+ */
+ .callback = dmi_disable_osi_vista,
+ .ident = "MSI GX723",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Micro-Star International"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "GX723"),
+ },
+ },
+ {
.callback = dmi_disable_osi_vista,
.ident = "Sony VGN-NS10J_S",
.matches = {