Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebdcefc6 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

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: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent a1485320

drivers/gpu/drm/i915/i915_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -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);