diff options
| author | Matthew Garrett <mjg59@srcf.ucam.org> | 2009-04-01 19:52:29 +0100 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-04-17 13:31:07 -0700 |
| commit | 3b1c1c1118880921da1188b7245e0470742802f8 (patch) | |
| tree | 5802350a461aa87519f7a5ce8e1db431be8ec52f /drivers/gpu/drm/i915/i915_opregion.c | |
| parent | d770e3cfe5a274a343d896b2cc1646af85646fbc (diff) | |
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_opregion.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_opregion.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_opregion.c b/drivers/gpu/drm/i915/i915_opregion.c index 8dc1fd3115c..3eceefe3475 100644 --- a/drivers/gpu/drm/i915/i915_opregion.c +++ b/drivers/gpu/drm/i915/i915_opregion.c @@ -409,7 +409,7 @@ err_out: return err; } -void intel_opregion_free(struct drm_device *dev) +void intel_opregion_free(struct drm_device *dev, int suspend) { struct drm_i915_private *dev_priv = dev->dev_private; struct intel_opregion *opregion = &dev_priv->opregion; @@ -417,6 +417,9 @@ void intel_opregion_free(struct drm_device *dev) if (!opregion->enabled) return; + if (!suspend) + acpi_video_exit(); + opregion->acpi->drdy = 0; system_opregion = NULL; |