diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2015-03-01 10:41:37 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-05-09 23:16:23 +0100 |
| commit | 44304628e6cf27c96fe6eea81a24855edf1dc676 (patch) | |
| tree | 7368be83c019e4dc7adea0e53567f9409a19288b /drivers/acpi | |
| parent | 7c35cf6b05d738c37586d3ad056b5d4fe2ec475f (diff) | |
| download | kernel_samsung_smdk4412-44304628e6cf27c96fe6eea81a24855edf1dc676.zip kernel_samsung_smdk4412-44304628e6cf27c96fe6eea81a24855edf1dc676.tar.gz kernel_samsung_smdk4412-44304628e6cf27c96fe6eea81a24855edf1dc676.tar.bz2 | |
ACPI / video: Load the module even if ACPI is disabled
commit 6e17cb12881ba8d5e456b89f072dc6b70048af36 upstream.
i915.ko depends upon the acpi/video.ko module and so refuses to load if
ACPI is disabled at runtime if for example the BIOS is broken beyond
repair. acpi/video provides an optional service for i915.ko and so we
should just allow the modules to load, but do no nothing in order to let
the machines boot correctly.
Reported-by: Bill Augur <bill-auger@programmer.net>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Jani Nikula <jani.nikula@intel.com>
Acked-by: Aaron Lu <aaron.lu@intel.com>
[ rjw: Fixed up the new comment in acpi_video_init() ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/video.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index 2ebfdd2..cb842a8 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c @@ -1854,6 +1854,17 @@ EXPORT_SYMBOL(acpi_video_unregister); static int __init acpi_video_init(void) { + /* + * Let the module load even if ACPI is disabled (e.g. due to + * a broken BIOS) so that i915.ko can still be loaded on such + * old systems without an AcpiOpRegion. + * + * acpi_video_register() will report -ENODEV later as well due + * to acpi_disabled when i915.ko tries to register itself afterwards. + */ + if (acpi_disabled) + return 0; + dmi_check_system(video_dmi_table); if (intel_opregion_present()) |