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

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

drm/i915: Move power well init earlier during driver load 



intel_modeset_init() will already attempt to disable VGA. In order to do
that, it needs the power well to be on. So move the power well init
to happen before intel_modeset_init() during driver load.

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 7d0bc1ea

drivers/gpu/drm/i915/i915_dma.c

+8 −7
Original line number Diff line number Diff line
@@ -1314,21 +1314,21 @@ static int i915_load_modeset_init(struct drm_device *dev) 
	if (ret)

		goto cleanup_gem_stolen;



	intel_init_power_well(dev);



	/* Keep VGA alive until i915_disable_vga_mem() */

	intel_display_power_get(dev, POWER_DOMAIN_VGA);



	/* Important: The output setup functions called by modeset_init need

	 * working irqs for e.g. gmbus and dp aux transfers. */

	intel_modeset_init(dev);



	ret = i915_gem_init(dev);

	if (ret)

		goto cleanup_irq;

		goto cleanup_power;



	INIT_WORK(&dev_priv->console_resume_work, intel_console_resume);



	intel_init_power_well(dev);



	/* Keep VGA alive until i915_disable_vga_mem() */

	intel_display_power_get(dev, POWER_DOMAIN_VGA);



	intel_modeset_gem_init(dev);



	/* Always safe in the mode setting case. */
@@ -1379,7 +1379,8 @@ cleanup_gem: 
	mutex_unlock(&dev->struct_mutex);

	i915_gem_cleanup_aliasing_ppgtt(dev);

	drm_mm_takedown(&dev_priv->gtt.base.mm);

cleanup_irq:

cleanup_power:

	intel_display_power_put(dev, POWER_DOMAIN_VGA);

	drm_irq_uninstall(dev);

cleanup_gem_stolen:

	i915_gem_cleanup_stolen(dev);