diff options
| author | Len Brown <len.brown@intel.com> | 2009-04-24 10:42:11 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-04-24 10:42:11 -0400 |
| commit | 1fe94d37f9296e8884c2f4ca4e22ca3d1398f15c (patch) | |
| tree | a25f17ea64b5d0209d187b952f88fbd27bc2ecf1 | |
| parent | 9c18f0b7095c7981c48f41aae8abdaa06a76d9b3 (diff) | |
| parent | b7f0ab460f772b09a9c664d746236a280fec714c (diff) | |
| download | linux-3.10-1fe94d37f9296e8884c2f4ca4e22ca3d1398f15c.tar.gz linux-3.10-1fe94d37f9296e8884c2f4ca4e22ca3d1398f15c.tar.bz2 linux-3.10-1fe94d37f9296e8884c2f4ca4e22ca3d1398f15c.zip | |
Merge branch 'bugzilla-13048' into release
| -rw-r--r-- | drivers/gpu/drm/i915/i915_opregion.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_opregion.c b/drivers/gpu/drm/i915/i915_opregion.c index 69427722d20..8dc1fd3115c 100644 --- a/drivers/gpu/drm/i915/i915_opregion.c +++ b/drivers/gpu/drm/i915/i915_opregion.c @@ -370,11 +370,8 @@ int intel_opregion_init(struct drm_device *dev, int resume) if (mboxes & MBOX_ACPI) { DRM_DEBUG("Public ACPI methods supported\n"); opregion->acpi = base + OPREGION_ACPI_OFFSET; - if (drm_core_check_feature(dev, DRIVER_MODESET)) { + if (drm_core_check_feature(dev, DRIVER_MODESET)) intel_didl_outputs(dev); - if (!resume) - acpi_video_register(); - } } else { DRM_DEBUG("Public ACPI methods not supported\n"); err = -ENOTSUPP; @@ -391,6 +388,10 @@ int intel_opregion_init(struct drm_device *dev, int resume) opregion->asle = base + OPREGION_ASLE_OFFSET; } + if (!resume) + acpi_video_register(); + + /* Notify BIOS we are ready to handle ACPI video ext notifs. * Right now, all the events are handled by the ACPI video module. * We don't actually need to do anything with them. */ |