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

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

drm/i915: Pull intel_init_power_well() out of intel_modeset_init_hw() 



The init and resume codepaths want to handel the power well in slightly
different ways, so pull the power well init out from
intel_modeset_init_hw() which gets called in both cases.

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 cdf8dd7f

drivers/gpu/drm/i915/i915_dma.c

+2 −0
Original line number Diff line number Diff line
@@ -1324,6 +1324,8 @@ static int i915_load_modeset_init(struct drm_device *dev) 


	INIT_WORK(&dev_priv->console_resume_work, intel_console_resume);



	intel_init_power_well(dev);



	intel_modeset_gem_init(dev);



	/* Always safe in the mode setting case. */

drivers/gpu/drm/i915/i915_drv.c

+2 −0
Original line number Diff line number Diff line
@@ -605,6 +605,8 @@ 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);

drivers/gpu/drm/i915/intel_display.c

+0 −2
Original line number Diff line number Diff line
@@ -10273,8 +10273,6 @@ static void i915_enable_vga(struct drm_device *dev) 


void intel_modeset_init_hw(struct drm_device *dev)

{

	intel_init_power_well(dev);



	intel_prepare_ddi(dev);



	intel_init_clock_gating(dev);