diff options
| author | Matthew Garrett | 2009-04-15 22:46:36 +0200 |
|---|---|---|
| committer | Eric Anholt | 2009-04-17 22:31:06 +0200 |
| commit | d770e3cfe5a274a343d896b2cc1646af85646fbc (patch) | |
| tree | 0d4eb5a9ba01f25b8bc9c4500cf2e2a09871e869 /drivers/gpu/drm | |
| parent | drm/i915: fix transition to I915_TILING_NONE (diff) | |
| download | kernel-qcow2-linux-d770e3cfe5a274a343d896b2cc1646af85646fbc.tar.gz kernel-qcow2-linux-d770e3cfe5a274a343d896b2cc1646af85646fbc.tar.xz kernel-qcow2-linux-d770e3cfe5a274a343d896b2cc1646af85646fbc.zip | |
drm/i915: Register ACPI video even when not modesetting
The ACPI video driver defers registration to the i915 driver if the
system supports opregion-mediated backlight control. This registration
was only being performed in the KMS case. Ensure it's done even if we
don't have modesetting enabled.
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm')
| -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 69427722d20e..8dc1fd3115c2 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. */ |