Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: ACPI: add DMI to disable AML Vista compatibility on MSI GX723 Notebook ACPI: Handle ACPI0007 Device in acpi_early_set_pdc
This commit is contained in:
Коммит
b411c17eb9
|
@ -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 = {
|
||||
|
|
|
@ -346,4 +346,5 @@ void __init acpi_early_processor_set_pdc(void)
|
|||
acpi_walk_namespace(ACPI_TYPE_PROCESSOR, ACPI_ROOT_OBJECT,
|
||||
ACPI_UINT32_MAX,
|
||||
early_init_pdc, NULL, NULL, NULL);
|
||||
acpi_get_devices("ACPI0007", early_init_pdc, NULL, NULL);
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче