Merge branches 'acpi-general' and 'acpi-video'
* acpi-general: ACPI: Fix bug when ACPI reset register is implemented in system memory * acpi-video: ACPI / video: Change the default for video.use_native_backlight to 1
This commit is contained in:
commit
de815a6d00
|
@ -1810,6 +1810,16 @@ acpi_status __init acpi_os_initialize(void)
|
||||||
acpi_os_map_generic_address(&acpi_gbl_FADT.xpm1b_event_block);
|
acpi_os_map_generic_address(&acpi_gbl_FADT.xpm1b_event_block);
|
||||||
acpi_os_map_generic_address(&acpi_gbl_FADT.xgpe0_block);
|
acpi_os_map_generic_address(&acpi_gbl_FADT.xgpe0_block);
|
||||||
acpi_os_map_generic_address(&acpi_gbl_FADT.xgpe1_block);
|
acpi_os_map_generic_address(&acpi_gbl_FADT.xgpe1_block);
|
||||||
|
if (acpi_gbl_FADT.flags & ACPI_FADT_RESET_REGISTER) {
|
||||||
|
/*
|
||||||
|
* Use acpi_os_map_generic_address to pre-map the reset
|
||||||
|
* register if it's in system memory.
|
||||||
|
*/
|
||||||
|
int rv;
|
||||||
|
|
||||||
|
rv = acpi_os_map_generic_address(&acpi_gbl_FADT.reset_register);
|
||||||
|
pr_debug(PREFIX "%s: map reset_reg status %d\n", __func__, rv);
|
||||||
|
}
|
||||||
|
|
||||||
return AE_OK;
|
return AE_OK;
|
||||||
}
|
}
|
||||||
|
@ -1838,6 +1848,8 @@ acpi_status acpi_os_terminate(void)
|
||||||
acpi_os_unmap_generic_address(&acpi_gbl_FADT.xgpe0_block);
|
acpi_os_unmap_generic_address(&acpi_gbl_FADT.xgpe0_block);
|
||||||
acpi_os_unmap_generic_address(&acpi_gbl_FADT.xpm1b_event_block);
|
acpi_os_unmap_generic_address(&acpi_gbl_FADT.xpm1b_event_block);
|
||||||
acpi_os_unmap_generic_address(&acpi_gbl_FADT.xpm1a_event_block);
|
acpi_os_unmap_generic_address(&acpi_gbl_FADT.xpm1a_event_block);
|
||||||
|
if (acpi_gbl_FADT.flags & ACPI_FADT_RESET_REGISTER)
|
||||||
|
acpi_os_unmap_generic_address(&acpi_gbl_FADT.reset_register);
|
||||||
|
|
||||||
destroy_workqueue(kacpid_wq);
|
destroy_workqueue(kacpid_wq);
|
||||||
destroy_workqueue(kacpi_notify_wq);
|
destroy_workqueue(kacpi_notify_wq);
|
||||||
|
|
|
@ -82,7 +82,7 @@ module_param(allow_duplicates, bool, 0644);
|
||||||
* For Windows 8 systems: used to decide if video module
|
* For Windows 8 systems: used to decide if video module
|
||||||
* should skip registering backlight interface of its own.
|
* should skip registering backlight interface of its own.
|
||||||
*/
|
*/
|
||||||
static int use_native_backlight_param = -1;
|
static int use_native_backlight_param = 1;
|
||||||
module_param_named(use_native_backlight, use_native_backlight_param, int, 0444);
|
module_param_named(use_native_backlight, use_native_backlight_param, int, 0444);
|
||||||
static bool use_native_backlight_dmi = false;
|
static bool use_native_backlight_dmi = false;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue