This is a note to let you know that I've just added the patch titled
ACPI / video: Load the module even if ACPI is disabled
to the 3.19-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
acpi-video-load-the-module-even-if-acpi-is-disabled.patch
and it can be found in the queue-3.19 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 6e17cb12881ba8d5e456b89f072dc6b70048af36 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Date: Sun, 1 Mar 2015 10:41:37 +0000
Subject: ACPI / video: Load the module even if ACPI is disabled
From: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxx>
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Cc: Daniel Vetter <daniel.vetter@xxxxxxxx>
Cc: Jani Nikula <jani.nikula@xxxxxxxxx>
Acked-by: Aaron Lu <aaron.lu@xxxxxxxxx>
[ rjw: Fixed up the new comment in acpi_video_init() ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/acpi/video.c | 11 +++++++++++
1 file changed, 11 insertions(+)
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -2149,6 +2149,17 @@ EXPORT_SYMBOL(acpi_video_unregister_back
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())
Patches currently in stable-queue which might be from chris@xxxxxxxxxxxxxxxxxx are
queue-3.19/drm-i915-check-obj-vma_list-under-the-struct_mutex.patch
queue-3.19/drm-i915-check-for-driver-readyness-before-handling-an-underrun-interrupt.patch
queue-3.19/acpi-video-load-the-module-even-if-acpi-is-disabled.patch
queue-3.19/drm-i915-prevent-use-after-free-in-invalidate_range_start-callback.patch
queue-3.19/drm-i915-insert-a-command-barrier-on-blt-bsd-cache-flushes.patch
queue-3.19/drm-i915-clamp-efficient-frequency-to-valid-range.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html