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 c23b3a95b7ce..a000cf028826 100644
--- 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: