From: "Ville Syrjälä" <ville.syrjala@linux.intel.com> To: Imre Deak <imre.deak@intel.com> Cc: intel-gfx@lists.freedesktop.org, Lucas De Marchi <lucas.demarchi@intel.com>, Rodrigo Vivi <rodrigo.vivi@intel.com>, Daniel Vetter <daniel.vetter@ffwll.ch>, stable@vger.kernel.org Subject: Re: [PATCH] drm/i915: Enable display WA#1183 from its correct spot Date: Thu, 19 Apr 2018 19:15:42 +0300 [thread overview] Message-ID: <20180419161542.GA13908@intel.com> (raw) In-Reply-To: <20180419155109.29451-1-imre.deak@intel.com> On Thu, Apr 19, 2018 at 06:51:09PM +0300, Imre Deak wrote: > The DMC FW specific part of display WA#1183 is supposed to be enabled > whenever enabling DC5 or DC6, so move it to the DC6 enable function > from the DC6 disable function. That does make more sense :) Reviewed-by: Ville Syrj�l� <ville.syrjala@linux.intel.com> > > I noticed this after Daniel's patch to remove the unused > skl_disable_dc6() function. > > Fixes: 53421c2fe99c ("drm/i915: Apply Display WA #1183 on skl, kbl, and cfl") > Cc: Lucas De Marchi <lucas.demarchi@intel.com> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> > Cc: Ville Syrj�l� <ville.syrjala@linux.intel.com> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch> > Cc: <stable@vger.kernel.org> > Signed-off-by: Imre Deak <imre.deak@intel.com> > --- > drivers/gpu/drm/i915/intel_runtime_pm.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c > index 53ea564f971e..66de4b2dc8b7 100644 > --- a/drivers/gpu/drm/i915/intel_runtime_pm.c > +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c > @@ -641,19 +641,18 @@ void skl_enable_dc6(struct drm_i915_private *dev_priv) > > DRM_DEBUG_KMS("Enabling DC6\n"); > > - gen9_set_dc_state(dev_priv, DC_STATE_EN_UPTO_DC6); > + /* Wa Display #1183: skl,kbl,cfl */ > + if (IS_GEN9_BC(dev_priv)) > + I915_WRITE(GEN8_CHICKEN_DCPR_1, I915_READ(GEN8_CHICKEN_DCPR_1) | > + SKL_SELECT_ALTERNATE_DC_EXIT); > > + gen9_set_dc_state(dev_priv, DC_STATE_EN_UPTO_DC6); > } > > void skl_disable_dc6(struct drm_i915_private *dev_priv) > { > DRM_DEBUG_KMS("Disabling DC6\n"); > > - /* Wa Display #1183: skl,kbl,cfl */ > - if (IS_GEN9_BC(dev_priv)) > - I915_WRITE(GEN8_CHICKEN_DCPR_1, I915_READ(GEN8_CHICKEN_DCPR_1) | > - SKL_SELECT_ALTERNATE_DC_EXIT); > - > gen9_set_dc_state(dev_priv, DC_STATE_DISABLE); > } > > -- > 2.13.2 -- Ville Syrj�l� Intel
WARNING: multiple messages have this Message-ID (diff)
From: "Ville Syrjälä" <ville.syrjala@linux.intel.com> To: Imre Deak <imre.deak@intel.com> Cc: intel-gfx@lists.freedesktop.org, Lucas De Marchi <lucas.demarchi@intel.com>, Rodrigo Vivi <rodrigo.vivi@intel.com>, Daniel Vetter <daniel.vetter@ffwll.ch>, stable@vger.kernel.org Subject: Re: [PATCH] drm/i915: Enable display WA#1183 from its correct spot Date: Thu, 19 Apr 2018 19:15:42 +0300 [thread overview] Message-ID: <20180419161542.GA13908@intel.com> (raw) In-Reply-To: <20180419155109.29451-1-imre.deak@intel.com> On Thu, Apr 19, 2018 at 06:51:09PM +0300, Imre Deak wrote: > The DMC FW specific part of display WA#1183 is supposed to be enabled > whenever enabling DC5 or DC6, so move it to the DC6 enable function > from the DC6 disable function. That does make more sense :) Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > > I noticed this after Daniel's patch to remove the unused > skl_disable_dc6() function. > > Fixes: 53421c2fe99c ("drm/i915: Apply Display WA #1183 on skl, kbl, and cfl") > Cc: Lucas De Marchi <lucas.demarchi@intel.com> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch> > Cc: <stable@vger.kernel.org> > Signed-off-by: Imre Deak <imre.deak@intel.com> > --- > drivers/gpu/drm/i915/intel_runtime_pm.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c > index 53ea564f971e..66de4b2dc8b7 100644 > --- a/drivers/gpu/drm/i915/intel_runtime_pm.c > +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c > @@ -641,19 +641,18 @@ void skl_enable_dc6(struct drm_i915_private *dev_priv) > > DRM_DEBUG_KMS("Enabling DC6\n"); > > - gen9_set_dc_state(dev_priv, DC_STATE_EN_UPTO_DC6); > + /* Wa Display #1183: skl,kbl,cfl */ > + if (IS_GEN9_BC(dev_priv)) > + I915_WRITE(GEN8_CHICKEN_DCPR_1, I915_READ(GEN8_CHICKEN_DCPR_1) | > + SKL_SELECT_ALTERNATE_DC_EXIT); > > + gen9_set_dc_state(dev_priv, DC_STATE_EN_UPTO_DC6); > } > > void skl_disable_dc6(struct drm_i915_private *dev_priv) > { > DRM_DEBUG_KMS("Disabling DC6\n"); > > - /* Wa Display #1183: skl,kbl,cfl */ > - if (IS_GEN9_BC(dev_priv)) > - I915_WRITE(GEN8_CHICKEN_DCPR_1, I915_READ(GEN8_CHICKEN_DCPR_1) | > - SKL_SELECT_ALTERNATE_DC_EXIT); > - > gen9_set_dc_state(dev_priv, DC_STATE_DISABLE); > } > > -- > 2.13.2 -- Ville Syrjälä Intel
next prev parent reply other threads:[~2018-04-19 16:15 UTC|newest] Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-04-19 15:51 [PATCH] drm/i915: Enable display WA#1183 from its correct spot Imre Deak 2018-04-19 15:51 ` Imre Deak 2018-04-19 16:15 ` Ville Syrjälä [this message] 2018-04-19 16:15 ` Ville Syrjälä 2018-04-19 16:25 ` ✓ Fi.CI.BAT: success for " Patchwork 2018-04-19 23:07 ` ✓ Fi.CI.IGT: " Patchwork 2018-04-20 8:58 ` Imre Deak
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180419161542.GA13908@intel.com \ --to=ville.syrjala@linux.intel.com \ --cc=daniel.vetter@ffwll.ch \ --cc=imre.deak@intel.com \ --cc=intel-gfx@lists.freedesktop.org \ --cc=lucas.demarchi@intel.com \ --cc=rodrigo.vivi@intel.com \ --cc=stable@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.