diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2015-03-01 13:41:37 +0300 |
|---|---|---|
| committer | Zefan Li <lizefan@huawei.com> | 2015-06-19 06:40:21 +0300 |
| commit | 4863cbc4c74d59556fc62c34fa8526becfc68aa3 (patch) | |
| tree | a3e8251f418b254bf37912061184c1947d843776 | |
| parent | 96aded1687b855b58f0277b3e6c1d6d3c73c2535 (diff) | |
| download | linux-4863cbc4c74d59556fc62c34fa8526becfc68aa3.tar.xz | |
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: Zefan Li <lizefan@huawei.com>
| -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 8c5ad89a65a5..89cff3724db4 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c @@ -1872,6 +1872,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()) |