Merge branch 'linus' into release

[linux-2.6-omap-h63xx.git] / drivers / gpu / drm / i915 / i915_dma.c

diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index c23b3a95b7cee3fcc7429e14cbe5d286b0b0d4ff..a000cf028826d635e42bf60d81bb0e36075252ad 100644 (file)
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1179,8 +1179,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;
 
@@ -1199,6 +1197,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: