From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com ([192.55.52.88]:27818 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752552AbcCGMlF (ORCPT ); Mon, 7 Mar 2016 07:41:05 -0500 Message-ID: <1457354461.26928.23.camel@intel.com> Subject: Re: FAILED: patch "[PATCH] drm/i915/skl: Fix power domain suspend sequence" failed to apply to 4.4-stable tree From: Imre Deak Reply-To: imre.deak@intel.com To: gregkh@linuxfoundation.org, jani.nikula@intel.com, patrik.jakobsson@linux.intel.com Cc: stable@vger.kernel.org Date: Mon, 07 Mar 2016 14:41:01 +0200 In-Reply-To: <145720548110083@kroah.com> References: <145720548110083@kroah.com> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: 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 On la, 2016-03-05 at 11:18 -0800, gregkh@linuxfoundation.org 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 . > > thanks, > > greg k-h > > ------------------ original commit in Linus's tree ------------------ > > From bd90123c4973821775d7ffae9891ad36017702a9 Mon Sep 17 00:00:00 > 2001 > From: Imre Deak > 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: stable@vger.kernel.org > CC: Patrik Jakobsson > Signed-off-by: Imre Deak > Reviewed-by: Patrik Jakobsson > Link: http://patchwork.freedesktop.org/patch/msgid/1456778945-5411-1- > git-send-email-imre.deak@intel.com > (cherry picked from commit 2622d79bd9d18fd04b650234e6a218c5f95cf308) > Signed-off-by: Jani Nikula > > diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c > b/drivers/gpu/drm/i915/intel_runtime_pm.c > index 678ed3475d7e..ef8d24d9a50f 100644 > --- a/drivers/gpu/drm/i915/intel_runtime_pm.c > +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c > @@ -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); >  } >   >  /** >