drm/i915: Move power well resume earlier
i915_restore_state() -> i915_restore_display() will attempt to
re-disable VGA during resume. So the power well needs to be powered on
before that.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 6f385e1..827c274 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -590,6 +590,8 @@
mutex_unlock(&dev->struct_mutex);
}
+ intel_init_power_well(dev);
+
i915_restore_state(dev);
intel_opregion_setup(dev);
@@ -605,8 +607,6 @@
/* We need working interrupts for modeset enabling ... */
drm_irq_install(dev);
- intel_init_power_well(dev);
-
intel_modeset_init_hw(dev);
drm_modeset_lock_all(dev);