From: Ville Syrjälä Date: Mon, 16 Sep 2013 14:38:35 +0000 (+0300) Subject: drm/i915: Move power well resume earlier X-Git-Tag: next-20131017~58^2~1^2~78 X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=ebdcefc6eb209b5197d2f0f73bcc9b0396fdf53e 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ä Reviewed-by: Paulo Zanoni Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 6f385e1e9ed6..827c274a8f20 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -590,6 +590,8 @@ static int __i915_drm_thaw(struct drm_device *dev, bool restore_gtt_mappings) mutex_unlock(&dev->struct_mutex); } + intel_init_power_well(dev); + i915_restore_state(dev); intel_opregion_setup(dev); @@ -605,8 +607,6 @@ static int __i915_drm_thaw(struct drm_device *dev, bool restore_gtt_mappings) /* 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);