diff options
| author | Matthew Garrett <mjg59@srcf.ucam.org> | 2009-03-19 21:35:39 +0000 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-03-27 22:11:03 -0400 |
| commit | 74a365b3f354fafc537efa5867deb7a9fadbfe27 (patch) | |
| tree | 66ebff203807d2ed77e77e1ccc2f71f63e571098 /drivers/gpu/drm/i915/i915_dma.c | |
| parent | c60d638e29c780b75b648283a197d0226e3576c3 (diff) | |
| download | blackbird-op-linux-74a365b3f354fafc537efa5867deb7a9fadbfe27.tar.gz blackbird-op-linux-74a365b3f354fafc537efa5867deb7a9fadbfe27.zip | |
ACPI: Populate DIDL before registering ACPI video device on Intel
Intel graphics hardware that implements the ACPI IGD OpRegion spec
requires that the list of display devices be populated before any ACPI
video methods are called. Detect when this is the case and defer
registration until the opregion code calls it. Fixes crashes on HP
laptops.
http://bugzilla.kernel.org/show_bug.cgi?id=11259
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Acked-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 6d21b9e48b89..638686904e06 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1144,8 +1144,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) if (!IS_I945G(dev) && !IS_I945GM(dev)) pci_enable_msi(dev->pdev); - intel_opregion_init(dev); - spin_lock_init(&dev_priv->user_irq_lock); dev_priv->user_irq_refcount = 0; @@ -1164,6 +1162,9 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) } } + /* Must be done after probing outputs */ + intel_opregion_init(dev, 0); + return 0; out_iomapfree: |
