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

Commit 2622d79b authored by Imre Deak's avatar Imre Deak
Browse files

drm/i915/skl: Fix power domain suspend sequence 



During system suspend we need to first disable power wells then
unitialize the display core. In case power well support is disabled we
did this in the wrong order, so fix this up.

Fixes: d314cd43 ("drm/i915: fix handling of the disable_power_well module option")
CC: stable@vger.kernel.org
CC: Patrik Jakobsson <patrik.jakobsson@linux.intel.com>
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarPatrik Jakobsson <patrik.jakobsson@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1456778945-5411-1-git-send-email-imre.deak@intel.com
parent f85db059

drivers/gpu/drm/i915/intel_runtime_pm.c

+3 −3
Original line number Diff line number Diff line
@@ -2319,15 +2319,15 @@ void intel_power_domains_init_hw(struct drm_i915_private *dev_priv, bool resume) 
 */

void intel_power_domains_suspend(struct drm_i915_private *dev_priv)

{

	if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv))

		skl_display_core_uninit(dev_priv);



	/*

	 * Even if power well support was disabled we still want to disable

	 * power wells while we are system suspended.

	 */

	if (!i915.disable_power_well)

		intel_display_power_put(dev_priv, POWER_DOMAIN_INIT);



	if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv))

		skl_display_core_uninit(dev_priv);

}



/**