summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Garrett <mjg59@srcf.ucam.org>2009-04-01 20:53:33 +0200
committerEric Anholt <eric@anholt.net>2009-04-17 22:31:09 +0200
commit44ab43155e8071fbf037513e57de9a79044edf56 (patch)
tree1b6198835d348203411c49a87a0e6f2ab64973b4
parentdrm/i915: Unregister ACPI video driver when exiting (diff)
downloadlinux-44ab43155e8071fbf037513e57de9a79044edf56.tar.xz
linux-44ab43155e8071fbf037513e57de9a79044edf56.zip
drm/i915: Enable ASLE if present
The changes to opregion initialisation order meant that the ASLE setup code might not be run at the correct time. Ensure that the interrupts are set up. Signed-off-by: Matthew Garrett <mjg@redhat.com> Signed-off-by: Eric Anholt <eric@anholt.net>
-rw-r--r--drivers/gpu/drm/i915/i915_opregion.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_opregion.c b/drivers/gpu/drm/i915/i915_opregion.c
index 3eceefe3475f..dc425e74a268 100644
--- a/drivers/gpu/drm/i915/i915_opregion.c
+++ b/drivers/gpu/drm/i915/i915_opregion.c
@@ -386,6 +386,7 @@ int intel_opregion_init(struct drm_device *dev, int resume)
if (mboxes & MBOX_ASLE) {
DRM_DEBUG("ASLE supported\n");
opregion->asle = base + OPREGION_ASLE_OFFSET;
+ opregion_enable_asle(dev);
}
if (!resume)