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

Commit 0dff9738 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2016-03-03' of git://anongit.freedesktop.org/drm-intel into drm-fixes 

Small conflict as I had the balance in my tree already for testing.

* tag 'drm-intel-fixes-2016-03-03' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: Balance assert_rpm_wakelock_held() for !IS_ENABLED(CONFIG_PM)
  drm/i915/skl: Fix power domain suspend sequence
parents f0511e66 eda90896

drivers/gpu/drm/i915/intel_runtime_pm.c

+3 −3
Original line number Diff line number Diff line
@@ -2303,15 +2303,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);

}



/**