summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_drv.c
diff options
context:
space:
mode:
authorMatthew Garrett2009-04-01 20:52:29 +0200
committerEric Anholt2009-04-17 22:31:07 +0200
commit3b1c1c1118880921da1188b7245e0470742802f8 (patch)
tree5802350a461aa87519f7a5ce8e1db431be8ec52f /drivers/gpu/drm/i915/i915_drv.c
parentdrm/i915: Register ACPI video even when not modesetting (diff)
downloadkernel-qcow2-linux-3b1c1c1118880921da1188b7245e0470742802f8.tar.gz
kernel-qcow2-linux-3b1c1c1118880921da1188b7245e0470742802f8.tar.xz
kernel-qcow2-linux-3b1c1c1118880921da1188b7245e0470742802f8.zip
drm/i915: Unregister ACPI video driver when exiting
The i915 DRM triggers registration of the ACPI video driver on load. It should unregister it at unload in order to avoid generating backtraces on being reloaded. Signed-off-by: Matthew Garrett <mjg@redhat.com> Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 6503e2210f65..98560e1e899a 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -77,7 +77,7 @@ static int i915_suspend(struct drm_device *dev, pm_message_t state)
drm_irq_uninstall(dev);
}
- intel_opregion_free(dev);
+ intel_opregion_free(dev, 1);
if (state.event == PM_EVENT_SUSPEND) {
/* Shut down the device */