Skip to contentSkip to conversation

FAILED: patch "[PATCH] drm/i915/skl: Fix power domain suspend sequence" failed to apply to 4.4-stable tree

PATCH [email protected] 2 participants 2 messages Mar 5, 2016 – Mar 7, 2016

Subsystems (3)
Stable branch DRM drivers Intel i915
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From bd90123c4973821775d7ffae9891ad36017702a9 Mon Sep 17 00:00:00 2001

From: Imre Deak <[email protected]>
Date: Mon, 29 Feb 2016 22:49:02 +0200
Subject: [PATCH] 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 [email protected]
CC Patrik Jakobsson <[email protected]>
Signed-off-by Imre Deak <[email protected]>
Reviewed-by Patrik Jakobsson <[email protected]>
Link http://patchwork.freedesktop.org/patch/msgid/[email protected]
(cherry picked from commit 2622d79bd9d18fd04b650234e6a218c5f95cf308)
Signed-off-by Jani Nikula <[email protected]>
drivers/gpu/drm/i915/intel_runtime_pm.c +3 -3
index 678ed3475d7e..ef8d24d9a50f 100644
@@ -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);
 }
 
 /**
#1 lore raw

No need for this in 4.4, it's only needed in 4.5 for which it's already merged. I added the stable tag thinking that the fix won't get merged until 4.5 is released, since I sent the fix very late in the rc cycle. In the future I will delay adding the stable tag in the same situation making sure that it's really needed.

Sorry for the noise,
Imre

Quoted 62 lines · On la, 2016-03-05 at 11:18 -0800, [email protected] wrote:

The patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit
id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From bd90123c4973821775d7ffae9891ad36017702a9 Mon Sep 17 00:00:00 2001
From: Imre Deak <[email protected]>
Date: Mon, 29 Feb 2016 22:49:02 +0200
Subject: [PATCH] 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 [email protected]
CC Patrik Jakobsson <[email protected]>
Signed-off-by Imre Deak <[email protected]>
Reviewed-by Patrik Jakobsson <[email protected]>
Link http://patchwork.freedesktop.org/patch/msgid/1456778945-5411-1-

[email protected]

(cherry picked from commit 2622d79bd9d18fd04b650234e6a218c5f95cf308)
Signed-off-by Jani Nikula <[email protected]>
drivers/gpu/drm/i915/intel_runtime_pm.c +0 -3
index 678ed3475d7e..ef8d24d9a50f 100644
@@ -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);

drivers/gpu/drm/i915/intel_runtime_pm.c +3 -0
+
+	if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv))
+		skl_display_core_uninit(dev_priv);

 }

 /**